diff --git a/gajim/gtk/htmltextview.py b/gajim/gtk/htmltextview.py
index 0414858efa6a11c193bd90967e6e8def21de44c0..96117e80c6099f6dc06a59b44f8821f83257d205 100644
--- a/gajim/gtk/htmltextview.py
+++ b/gajim/gtk/htmltextview.py
@@ -963,7 +963,9 @@ def display_html(self, html, textview, conv_textview, iter_=None):
     def _delete_last_char(buffer_, iter_):
         start_iter = iter_.copy()
         start_iter.backward_char()
-        buffer_.delete(start_iter, iter_)
+        text = buffer_.get_text(start_iter, iter_, True)
+        if text == '\n':
+            buffer_.delete(start_iter, iter_)
 
     @staticmethod
     def _on_copy_clipboard(textview):