diff --git a/ChangeLog b/ChangeLog
index 9ca24252f..b609e1943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m (+): added all simple
+	tag to "VoidTags", based on list from
+	http://www.w3.org/TR/html4/index/elements.html.
+
 2012-02-10  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/generic.js (openMailTo): recipients are
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index c0fb7f161..35921b0a9 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -236,7 +236,13 @@ static NSData* _sanitizeContent(NSData *theData)
                                   @"frame", @"iframe", @"applet", @"link",
                                   @"base", @"meta", @"title", nil];
   if (!VoidTags)
-    VoidTags = [[NSArray alloc] initWithObjects: @"br", @"hr", nil];
+    {
+      /* see http://www.w3.org/TR/html4/index/elements.html */
+      VoidTags = [[NSArray alloc] initWithObjects: @"area", @"base",
+                                  @"basefont", @"br", @"col", @"frame", @"hr",
+                                  @"img", @"input", @"isindex", @"link",
+                                @"meta", @"param", @"", nil];
+    }
 }
 
 - (id) init