4 files changed, 12 insertions, 14 deletions
diff --git a/src/event/client_events.c b/src/event/client_events.c
index ea327ca1..9f1acca4 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -70,7 +70,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
 #else
     char *id = message_send_chat(chatwin->barejid, msg);
     chat_log_msg_out(chatwin->barejid, msg);
-    ui_outgoing_chat_msg(chatwin->barejid, msg, id);
+    ui_outgoing_chat_msg(chatwin, msg, id);
     free(id);
 #endif
 }
diff --git a/src/otr/otr.c b/src/otr/otr.c
index ae8ed006..fbc26eb8 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -325,7 +325,7 @@ otr_on_message_send(ProfChatWin *chatwin, const char * const message)
         if (encrypted) {
             id = message_send_chat_encrypted(chatwin->barejid, encrypted);
             chat_log_otr_msg_out(chatwin->barejid, message);
-            ui_outgoing_chat_msg(chatwin->barejid, message, id);
+            ui_outgoing_chat_msg(chatwin, message, id);
             otr_free_message(encrypted);
         } else {
             ui_win_error_line((ProfWin*)chatwin, "Failed to encrypt and send message.");
@@ -339,13 +339,13 @@ otr_on_message_send(ProfChatWin *chatwin, const char * const message)
     } else if (policy == PROF_OTRPOLICY_OPPORTUNISTIC) {
         char *otr_tagged_msg = otr_tag_message(message);
         id = message_send_chat_encrypted(chatwin->barejid, otr_tagged_msg);
-        ui_outgoing_chat_msg(chatwin->barejid, message, id);
+        ui_outgoing_chat_msg(chatwin, message, id);
         chat_log_msg_out(chatwin->barejid, message);
         free(otr_tagged_msg);
 
     } else {
         id = message_send_chat(chatwin->barejid, message);
-        ui_outgoing_chat_msg(chatwin->barejid, message, id);
+        ui_outgoing_chat_msg(chatwin, message, id);
         chat_log_msg_out(chatwin->barejid, message);
     }
 
diff --git a/src/ui/core.c b/src/ui/core.c
index fb1a4219..b4cef52d 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -433,15 +433,15 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
         win_print_incoming_message(window, tv_stamp, display_name, message);
     }
 
+    if (prefs_get_boolean(PREF_BEEP)) {
+        beep();
+    }
+
     int ui_index = num;
     if (ui_index == 10) {
         ui_index = 0;
     }
 
-    if (prefs_get_boolean(PREF_BEEP)) {
-        beep();
-    }
-
     if (prefs_get_boolean(PREF_NOTIFY_MESSAGE)) {
         gboolean is_current = wins_is_current(window);
         if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT)) ) {
@@ -1329,14 +1329,12 @@ ui_new_chat_win(const char * const barejid)
 }
 
 void
-ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id)
+ui_outgoing_chat_msg(ProfChatWin *chatwin, const char * const message, char *id)
 {
-    ProfWin *window = (ProfWin*)wins_get_chat(barejid);
-
     if (prefs_get_boolean(PREF_RECEIPTS_REQUEST) && id) {
-        win_print_with_receipt(window, '-', NULL, 0, THEME_TEXT_ME, "me", message, id);
+        win_print_with_receipt((ProfWin*)chatwin, '-', NULL, 0, THEME_TEXT_ME, "me", message, id);
     } else {
-        win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message);
+        win_print((ProfWin*)chatwin, '-', NULL, 0, THEME_TEXT_ME, "me", message);
     }
 }
 
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 6d85c9e8..212ed451 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -120,7 +120,7 @@ void ui_message_receipt(const char * const barejid, const char * const id);
 void ui_disconnected(void);
 void ui_recipient_gone(const char * const barejid, const char * const resource);
 
-void ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id);
+void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char * const message, char *id);
 void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message);
 void ui_outgoing_private_msg(const char * const fulljid, const char * const message);