1.1 --- a/CpEpEngine.cpp	Fri Jul 03 23:32:26 2020 +0200
     1.2 +++ b/CpEpEngine.cpp	Sat Jul 04 19:35:28 2020 +0200
     1.3 @@ -1007,9 +1007,6 @@
     1.4  {
     1.5      bool in_sync = on_sync_thread();
     1.6  
     1.7 -    if (in_sync && !msg)
     1.8 -        return pEp::PassphraseCache::messageToSend(passphrase_cache, session());
     1.9 -
    1.10      for (auto p = sync_callbacks.begin(); p != sync_callbacks.end(); ++p) {
    1.11          IpEpEngineCallbacks *cb = in_sync ? _unmarshaled_consumer(p) : p->pdata->unmarshaled;
    1.12  

     2.1 --- a/CpEpEngine.h	Fri Jul 03 23:32:26 2020 +0200
     2.2 +++ b/CpEpEngine.h	Sat Jul 04 19:35:28 2020 +0200
     2.3 @@ -14,7 +14,7 @@
     2.4  using namespace pEp::utility;
     2.5  using namespace pEp::Adapter;
     2.6  
     2.7 -extern pEp::PassphraseCache passphrase_cache;
     2.8 +pEp::PassphraseCache& passphrase_cache = pEp::passphrase_cache;
     2.9  
    2.10  // CpEpEngine
    2.11  

     3.1 --- a/pEpCOMServerAdapter.cpp	Fri Jul 03 23:32:26 2020 +0200
     3.2 +++ b/pEpCOMServerAdapter.cpp	Sat Jul 04 19:35:28 2020 +0200
     3.3 @@ -29,7 +29,6 @@
     3.4  
     3.5  CpEpCOMServerAdapterModule _AtlModule;
     3.6  LocalJSONAdapter* ljs = nullptr;
     3.7 -pEp::PassphraseCache passphrase_cache;
     3.8  CMainWindow mainWindow;
     3.9  
    3.10  extern "C" int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,