diff --git a/src/common/connection.py b/src/common/connection.py
index a92f929b4..e0a257f33 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -355,7 +355,10 @@ class CommonConnection:
         else:
             msgtxt = obj.message
 
-        fjid = obj.get_full_jid()
+        if obj.jid == gajim.get_jid_from_account(self.name):
+            fjid = obj.jid
+        else:
+            fjid = obj.get_full_jid()
 
         if obj.correction_msg:
             id_ = obj.correction_msg.getID()
diff --git a/src/message_control.py b/src/message_control.py
index 5a6422e2f..c07feb6b2 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -235,7 +235,8 @@ class MessageControl(object):
         conn = gajim.connections[self.account]
 
         if not self.session:
-            if not obj.resource:
+            if (not obj.resource and
+                    obj.jid != gajim.get_jid_from_account(self.account)):
                 if self.resource:
                     obj.resource = self.resource
                 else:
diff --git a/src/roster_window.py b/src/roster_window.py
index 1d16b700a..132bd7f3a 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3916,7 +3916,7 @@ class RosterWindow:
             contact = gajim.contacts.get_contact_with_highest_priority(account,
                     jid)
         if jid == gajim.get_jid_from_account(account):
-            resource = contact.resource
+            resource = None
 
         gajim.interface.on_open_chat_window(None, contact, account, \
             resource=resource, session=session)