diff --git a/core/handlers/messagehandler.cpp b/core/handlers/messagehandler.cpp
index 094f671..ae6c695 100644
--- a/core/handlers/messagehandler.cpp
+++ b/core/handlers/messagehandler.cpp
@@ -431,7 +431,7 @@ QMap<QString, QVariant> Core::MessageHandler::getChanges(Shared::Message& data,
 }
 
 QXmppMessage Core::MessageHandler::createPacket(const Shared::Message& data, const QDateTime& time, const QString& originalId) const {
-    QXmppMessage msg(acc->getFullJid(), data.getTo(), data.getBody(), data.getThread());
+    QXmppMessage msg(QString(), data.getTo(), data.getBody(), data.getThread());
     QString id(data.getId());
 
     if (originalId.size() > 0)
diff --git a/core/squawk.cpp b/core/squawk.cpp
index 5978651..1d1abe5 100644
--- a/core/squawk.cpp
+++ b/core/squawk.cpp
@@ -33,10 +33,10 @@ Core::Squawk::Squawk(QObject* parent):
     state(Shared::Availability::offline),
     network(),
     isInitialized(false),
-    clientCache(),
 #ifdef WITH_KWALLET
-    kwallet()
+    kwallet(),
 #endif
+    clientCache()
 {
     connect(&network, &NetworkAccess::loadFileProgress, this, &Squawk::fileProgress);
     connect(&network, &NetworkAccess::loadFileError, this, &Squawk::fileError);
diff --git a/core/squawk.h b/core/squawk.h
index 8586498..983f5ab 100644
--- a/core/squawk.h
+++ b/core/squawk.h
@@ -137,11 +137,12 @@ private:
     Shared::Availability state;
     NetworkAccess network;
     bool isInitialized;
-    ClientCache clientCache;
 
 #ifdef WITH_KWALLET
     PSE::KWallet kwallet;
 #endif
+
+    ClientCache clientCache;
     
 private slots:
     void addAccount(