diff --git a/ChangeLog b/ChangeLog
index 23dca6253..f0c42e232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
->>>>>>> variant B
 2012-02-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactView.m (-photoURL, -hasPhoto): copied code
@@ -10,6 +9,16 @@
 	all simple tag to "VoidTags", based on list from
 	http://www.w3.org/TR/html4/index/elements.html.
 
+	* UI/WebServerResources/JavascriptAPIExtensions.js
+	(String.asCSSIdentifier): same as below.
+
+	* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
+	"_P_" as escaping sequence for "+".
+
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m (+initialize): 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
@@ -19,14 +28,6 @@
 	(-startElement:namespace:rawName:attributes:): we should not add
 	end tags to void tags (ex: <br>).
 
-2012-02-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
-
-	* UI/WebServerResources/JavascriptAPIExtensions.js
-	(String.asCSSIdentifier): same as below.
-
-	* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
-	"_P_" as escaping sequence for "+".
-
 2012-02-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m (+webdavAclManager): must include