diff --git a/src/dialogs.py b/src/dialogs.py
index 5d515153b..efbf2542e 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1020,7 +1020,7 @@ class SingleMessageWindow:
 				gajim.config.get('single_msg-height'))
 		self.window.show_all()
 
-	def on_single_message_window_destroy(self, window):
+	def save_pos(self):
 		if gajim.config.get('saveposition'):
 			# save the window size and position
 			x, y = self.window.get_position()
@@ -1030,6 +1030,9 @@ class SingleMessageWindow:
 			gajim.config.set('single_msg-width', width)
 			gajim.config.set('single_msg-height', height)
 
+	def on_single_message_window_delete_event(self, window, ev):
+		self.save_pos()
+
 	def prepare_widgets_for(self, action):
 		our_jid = gajim.config.get_per('accounts', self.account, 'name') + '@' + \
 			gajim.config.get_per('accounts', self.account, 'hostname')
@@ -1060,6 +1063,7 @@ class SingleMessageWindow:
 		self.window.set_title(title)
 
 	def on_cancel_button_clicked(self, widget):
+		self.save_pos()
 		self.window.destroy()
 
 	def update_char_counter(self, widget):
@@ -1110,10 +1114,12 @@ class SingleMessageWindow:
 
 	def on_send_and_close_button_clicked(self, widget):
 		self.send_single_message()
+		self.save_pos()
 		self.window.destroy()
 
 	def on_single_message_window_key_press_event(self, widget, event):
 		if event.keyval == gtk.keysyms.Escape: # ESCAPE
+			self.save_pos()
 			self.window.destroy()
 
 class XMLConsoleWindow:
diff --git a/src/gajim.py b/src/gajim.py
index 9594fea2d..2c92d2ba8 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -49,7 +49,7 @@ try:
 except ImportError:
 	pritext = _('GTK+ runtime is missing libglade support')
 	if os.name == 'nt':
-		sectext = _('Please download remove your current GTK+ runtime and install the latest stable version from %s') % 'http://gladewin32.sourceforge.net'
+		sectext = _('Please remove your current GTK+ runtime and install the latest stable version from %s') % 'http://gladewin32.sourceforge.net'
 	else:
 		sectext = _('Please make sure that gtk and pygtk have libglade support in your system.')
 	
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index a9e021f81..a9c50f70d 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -16968,7 +16968,7 @@ Last Message</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <signal name="key_press_event" handler="on_single_message_window_key_press_event" last_modification_time="Tue, 05 Jul 2005 22:02:15 GMT"/>
-  <signal name="destroy" handler="on_single_message_window_destroy" last_modification_time="Mon, 17 Oct 2005 08:22:51 GMT"/>
+  <signal name="delete_event" handler="on_single_message_window_delete_event" last_modification_time="Mon, 17 Oct 2005 15:32:50 GMT"/>
 
   <child>
     <widget class="GtkVBox" id="vbox97">