diff --git a/src/conversationmanager.cpp b/src/conversationmanager.cpp
index d967df34210fbba38722a92dd39a0f8a3e411250..e6f7e2dc2d151b6febe648c42c8d2d57505b9e25 100644
--- a/src/conversationmanager.cpp
+++ b/src/conversationmanager.cpp
@@ -42,6 +42,15 @@ ConversationManager::~ConversationManager() {
 	deleteAllConversations();
 }
 
+void ConversationManager::sendCachedChatMessages() {
+	for (std::map<std::string, Conversation *>::const_iterator it = m_convs.begin(); it != m_convs.end(); it++) {
+		if ((*it).second->isMUC()) {
+			continue;
+		}
+		(*it).second->sendCachedMessages();
+	}
+}
+
 void ConversationManager::deleteAllConversations() {
 	while(!m_convs.empty()) {
 		LOG4CXX_INFO(logger, m_user->getJID().toString() << ": Removing conversation " << (*m_convs.begin()).first);