diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 2ae551af5f21cc4a6e43d281e67e896b8cac82c2..591c96501a9a8fcba263d686b7f404ab7b4739f8 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -579,6 +579,7 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool
 
 	// Forward it
 	conv->handleMessage(msg, payload.nickname());
+	m_userManager->messageToXMPPSent();
 }
 
 void NetworkPluginServer::handleAttentionPayload(const std::string &data) {
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ed99e668e5684369b925b95374880cb58bdc6a94..1845d94e07a5990b903ba65aa94d7fff958012a2 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -268,6 +268,7 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 	}
 
 	user->getConversationManager()->handleMessageReceived(message);
+	messageToBackendSent();
 }
 
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {