diff --git a/src/conversation.cpp b/src/conversation.cpp
index c02396e5a6d00547e7ba9283ea8d58c073c77032..dce307c37921cc06d1a4fe69e54bb346a8b9472e 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -214,6 +214,17 @@ void Conversation::sendCachedMessages(const Swift::JID &to) {
 		}
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(*it);
 	}
+
+	if (m_subject) {
+		if (to.isValid()) {
+			m_subject->setTo(to);
+		}
+		else {
+			m_subject->setTo(m_jid.toBare());
+		}
+		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(m_subject);
+	}
+
 	m_cachedMessages.clear();
 }