diff --git a/include/transport/conversation.h b/include/transport/conversation.h
index 268326b067df5e342aad32c7349ee5f9ecf1b9c2..032ddef36a69814145acf3de0e12dd1f12c3a4f2 100644
--- a/include/transport/conversation.h
+++ b/include/transport/conversation.h
@@ -85,9 +85,7 @@ class Conversation {
 		/// Sets XMPP user nickname in MUC rooms.
 
 		/// \param nickname XMPP user nickname in MUC rooms.
-		void setNickname(const std::string &nickname) {
-			m_nickname = nickname;
-		}
+		void setNickname(const std::string &nickname);
 
 		const std::string &getNickname() {
 			return m_nickname;
@@ -166,6 +164,7 @@ class Conversation {
 		std::map<std::string, Participant> m_participants;
 		boost::shared_ptr<Swift::Message> m_subject;
 		bool m_sentInitialPresence;
+		bool m_nicknameChanged;
 		std::list<boost::shared_ptr<Swift::Message> > m_cachedMessages;
 };