diff --git a/ChangeLog b/ChangeLog
index 84df10e72..45c599e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
 === Deluge 1.2.0_rc3 (In Development) ===
 ==== Core ====
 	* Fix #1047 move completed does not work if saving to non default path
-	
+
+==== GtkUI ====
+	* replace & with & in the details tab to ensure there are no markup errors
+
+==== Web ====
+	* Fix #1046 changing auto managed via the details tab
+	* Fix setting torrent options when adding
+	* Fix setting file priorities when adding
+	* HTML escape the field values on the details tab
+
 === Deluge 1.2.0_rc2 (25 October 2009) ===
 ==== GtkUI ====
 	* Fix path errors when adding torrents externally in Windows
diff --git a/deluge/ui/gtkui/details_tab.py b/deluge/ui/gtkui/details_tab.py
index e4ddb8288..e863b51b7 100644
--- a/deluge/ui/gtkui/details_tab.py
+++ b/deluge/ui/gtkui/details_tab.py
@@ -105,9 +105,9 @@ class DetailsTab(Tab):
 
             if widget[0].get_text() != txt:
                 if widget[2][0] == 'comment' and is_url(txt):
-                    widget[0].set_markup('<a href="%s">%s</a>' % (txt, txt))
+                    widget[0].set_markup('<a href="%s">%s</a>' % (txt, txt.replace('&', '&amp;')))
                 else:
-                    widget[0].set_markup(txt)
+                    widget[0].set_markup(txt.replace('&', '&amp;'))
 
     def clear(self):
         for widget in self.label_widgets: