1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 530739ae..7d583b43 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -320,7 +320,10 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
         }
 
         win_insert_last_read_position_marker((ProfWin*)chatwin, chatwin->barejid);
-        win_print_incoming(window, display_name, message);
+
+        if (!win_created || !prefs_get_boolean(PREF_MAM)) {
+            win_print_incoming(window, display_name, message);
+        }
     }
 
     wins_add_urls_ac(window, message);