diff --git a/src/message_textview.py b/src/message_textview.py
index 71a6d5da2594925bff437b10e3cfec2c2111459d..fb4aadf9730b0c706063c5cf4041f385454e397d 100644
--- a/src/message_textview.py
+++ b/src/message_textview.py
@@ -217,6 +217,7 @@ class MessageTextView(gtk.TextView):
 		def xhtml_special(text):
 			text = text.replace('<', '&lt;')
 			text = text.replace('>', '&gt;')
+			text = text.replace('&', '&amp;')
 			text = text.replace('\n', '<br />')
 			return text