diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 40070281..98674fdd 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -270,8 +270,8 @@ class HandlerCore:
 
         if not own and not conversation.nick:
             conversation.nick = remote_nick
-        elif not own: # keep a fixed nick during the whole conversation
-            remote_nick = conversation.nick
+        elif not own:
+            remote_nick = conversation.get_nick()
 
         self.core.events.trigger('conversation_msg', message, conversation)
         if not message['body']: