diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index 55b4c56487a73b1a722ea850cfcd278b219443e7..7e1c2717b42402267a7317937f9720006a518415 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -1153,7 +1153,8 @@ class ConversationTextview(GObject.GObject):
             direction_mark = i18n.direction_mark
 
         # print the encryption icon
-        self.print_encryption_status(iter_, additional_data)
+        if kind in ('incoming', 'outgoing'):
+            self.print_encryption_status(iter_, additional_data)
 
         # print the time stamp
         self.print_time(text, kind, tim, simple, direction_mark,
diff --git a/gajim/gtk/history.py b/gajim/gtk/history.py
index 17526558475588002d84ea606b3b0766be579890..82f33b0911034d3faf2120221198acba16d72237 100644
--- a/gajim/gtk/history.py
+++ b/gajim/gtk/history.py
@@ -535,8 +535,10 @@ class HistoryWindow:
                     end_iter, tim + '\n', 'time_sometimes')
 
         # print the encryption icon
-        self.history_textview.print_encryption_status(
-            end_iter, additional_data)
+        if kind in (KindConstant.CHAT_MSG_SENT,
+                    KindConstant.CHAT_MSG_RECV):
+            self.history_textview.print_encryption_status(
+                end_iter, additional_data)
 
         tag_name = ''
         tag_msg = ''