diff --git a/include/transport/buddy.h b/include/transport/buddy.h
index 929ba337037d41d8c007c17e2691355a12efc507..35205822b3e8a932682aa70b0dbda4160ca84798 100644
--- a/include/transport/buddy.h
+++ b/include/transport/buddy.h
@@ -47,7 +47,7 @@ class Buddy {
 		/// \param rosterManager RosterManager associated with this buddy.
 		/// \param id ID which identifies the buddy in database or -1 if it's new buddy which is
 		/// not in database yet.
-		Buddy(RosterManager *rosterManager, long id = -1);
+		Buddy(RosterManager *rosterManager, long id = -1, BuddyFlag flags = BUDDY_NO_FLAG);
 
 		/// Destructor
 		virtual ~Buddy();
@@ -165,14 +165,15 @@ class Buddy {
 		/// \param jid Jabber ID.
 		/// \return legacy name of buddy from JID.
 		static std::string JIDToLegacyName(const Swift::JID &jid);
-		static BuddyFlag buddFlagsFromJID(const Swift::JID &jid);
+		static BuddyFlag buddyFlagsFromJID(const Swift::JID &jid);
 
-	private:
+	protected:
 		void generateJID();
+		Swift::JID m_jid;
 
+	private:
 		long m_id;
 // 		Swift::Presence::ref m_lastPresence;
-		Swift::JID m_jid;
 		BuddyFlag m_flags;
 		RosterManager *m_rosterManager;
 		Subscription m_subscription;