diff --git a/ChangeLog b/ChangeLog
index 9cb1cbd9e..924ec9db6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-01  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailListActions.m (-messageSubject): we now
+	escape HTML tags in the returned string.
+
 2010-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailBaseObject.m (-_createIMAP4Connection):
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index 37480a71f..834d82337 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -192,7 +192,7 @@
   if (![subject length])
     subject = [self labelForKey: @"Untitled"];
 
-  return subject;
+  return [subject stringByEscapingHTMLString];
 }
 
 - (BOOL) showToAddress