diff --git a/src/history_manager.glade b/src/history_manager.glade
index 7a35bc6ae..2262f8417 100644
--- a/src/history_manager.glade
+++ b/src/history_manager.glade
@@ -77,7 +77,8 @@
 
 You can select logs from the left and/or search database from below.
 
-&lt;b&gt;NOTE:&lt;/b&gt; If you plan to do massive deletions, please make sure Gajim is not running.</property>
+&lt;span background=&quot;lightyellow&quot;&gt;&lt;b&gt;WARNING:&lt;/b&gt; If you plan to do massive deletions, please make sure Gajim is not running.
+Generally avoid deletions with contacts you currently chat with.&lt;/span&gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/src/history_manager.py b/src/history_manager.py
index efa56eee9..b4bd40481 100755
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -86,7 +86,6 @@ class HistoryManager:
 		
 		self.search_entry.grab_focus()
 
-		self.window.maximize()
 		self.window.show_all()
 		
 		xml.signal_autoconnect(self)
@@ -159,7 +158,8 @@ class HistoryManager:
 	def on_history_manager_window_delete_event(self, widget, event):
 		if self.AT_LEAST_ONE_DELETION_DONE:
 			dialog = dialogs.YesNoDialog(
-				_('Do you want to clean up the database?'),
+				_('Do you want to clean up the database? '
+				'(STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)'),
 				_('Normally allocated database size will not be freed, '
 					'it will just become reusable. If you really want to reduce '
 					'database filesize, click YES, else click NO.'