--- a/mcabber/mcabber/screen.c	Sun May 22 23:30:37 2011 +0200
+++ b/mcabber/mcabber/screen.c	Sun May 22 23:54:32 2011 +0200
@@ -2554,8 +2554,10 @@
   if (!alternate_buddy || g_list_position(buddylist, alternate_buddy) == -1)
     return;
   set_current_buddy(alternate_buddy);
-  if (chatmode)
+  if (chatmode) {
+    last_activity_buddy = current_buddy;
     scr_show_buddy_window();
+  }
 }
 
 //  scr_roster_display(filter)