diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index 3dccc881..3b64c7aa 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -477,10 +477,10 @@ plugins_on_disconnect(const char* const account_name, const char* const fulljid)
 }
 
 char*
-plugins_pre_chat_message_display(const char* const barejid, const char* const resource, const char* message)
+plugins_pre_chat_message_display(const char* const barejid, const char* const resource, char* message)
 {
     char* new_message = NULL;
-    char* curr_message = strdup(message);
+    char* curr_message = message;
 
     GList* values = g_hash_table_get_values(plugins);
     GList* curr = values;
@@ -489,8 +489,7 @@ plugins_pre_chat_message_display(const char* const barejid, const char* const re
         new_message = plugin->pre_chat_message_display(plugin, barejid, resource, curr_message);
         if (new_message) {
             free(curr_message);
-            curr_message = strdup(new_message);
-            free(new_message);
+            curr_message = new_message;
         }
         curr = g_list_next(curr);
     }
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index 48423b64..0bd69e41 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -134,7 +134,7 @@ void plugins_on_shutdown(void);
 void plugins_on_connect(const char* const account_name, const char* const fulljid);
 void plugins_on_disconnect(const char* const account_name, const char* const fulljid);
 
-char* plugins_pre_chat_message_display(const char* const barejid, const char* const resource, const char* message);
+char* plugins_pre_chat_message_display(const char* const barejid, const char* const resource, char* message);
 void plugins_post_chat_message_display(const char* const barejid, const char* const resource, const char* message);
 char* plugins_pre_chat_message_send(const char* const barejid, const char* message);
 void plugins_post_chat_message_send(const char* const barejid, const char* message);
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index c9690c39..4317cc78 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -322,7 +322,9 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
 
     char* old_plain = message->plain;
 
-    message->plain = plugins_pre_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain);
+    auto_char char* new_plain = plugins_pre_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, strdup(message->plain));
+    message->plain = new_plain;
+
     gboolean show_message = true;
 
     ProfWin* window = (ProfWin*)chatwin;
@@ -411,7 +413,6 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
 
     plugins_post_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain);
 
-    free(message->plain);
     message->plain = old_plain;
 }
 
@@ -426,15 +427,18 @@ chatwin_outgoing_msg(ProfChatWin* chatwin, const char* const message, char* id,
 
     auto_char char* enc_char = get_enc_char(enc_mode, chatwin->outgoing_char);
 
+    auto_jid Jid* myjid = jid_create(connection_get_fulljid());
+    auto_char char* display_message = plugins_pre_chat_message_display(myjid->barejid, myjid->resourcepart, strdup(message));
+
     if (request_receipt && id) {
-        win_print_outgoing_with_receipt((ProfWin*)chatwin, enc_char, "me", message, id, replace_id);
+        win_print_outgoing_with_receipt((ProfWin*)chatwin, enc_char, "me", display_message, id, replace_id);
     } else {
-        win_print_outgoing((ProfWin*)chatwin, enc_char, id, replace_id, message);
+        win_print_outgoing((ProfWin*)chatwin, enc_char, id, replace_id, display_message);
     }
 
     // save last id and message for LMC in case if it's not LMC message
     if (id && !replace_id) {
-        _chatwin_set_last_message(chatwin, id, message);
+        _chatwin_set_last_message(chatwin, id, display_message);
     }
 }
 
@@ -575,11 +579,7 @@ _chatwin_history(ProfChatWin* chatwin, const char* const contact_barejid)
 
         while (curr) {
             ProfMessage* msg = curr->data;
-            char* msg_plain = msg->plain;
             msg->plain = plugins_pre_chat_message_display(msg->from_jid->barejid, msg->from_jid->resourcepart, msg->plain);
-            // This is dirty workaround for memory leak. We reassign msg->plain above so have to free previous object
-            // TODO: Make a better solution, for example, pass msg object to the function and it will replace msg->plain properly if needed.
-            free(msg_plain);
             win_print_history((ProfWin*)chatwin, msg);
             curr = g_slist_next(curr);
         }
@@ -605,11 +605,7 @@ chatwin_db_history(ProfChatWin* chatwin, const char* start_time, char* end_time,
 
     while (curr) {
         ProfMessage* msg = curr->data;
-        char* msg_plain = msg->plain;
         msg->plain = plugins_pre_chat_message_display(msg->from_jid->barejid, msg->from_jid->resourcepart, msg->plain);
-        // This is dirty workaround for memory leak. We reassign msg->plain above so have to free previous object
-        // TODO: Make a better solution, for example, pass msg object to the function and it will replace msg->plain properly if needed.
-        free(msg_plain);
         if (flip) {
             win_print_old_history((ProfWin*)chatwin, msg);
         } else {