diff --git a/src/dialogs.py b/src/dialogs.py
index 1c318fbb1..29a7e357a 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1020,6 +1020,16 @@ class SingleMessageWindow:
 				gajim.config.get('single-height'))
 		self.window.show_all()
 
+	def on_single_message_window_destroy(self, window):
+		if gajim.config.get('saveposition'):
+			# save the window size and position
+			x, y = self.window.get_position()
+			gajim.config.set('single-x-position', x)
+			gajim.config.set('single-y-position', y)
+			width, height = self.window.get_size()
+			gajim.config.set('single-width', width)
+			gajim.config.set('single-height', height)
+
 	def prepare_widgets_for(self, action):
 		our_jid = gajim.config.get_per('accounts', self.account, 'name') + '@' + \
 			gajim.config.get_per('accounts', self.account, 'hostname')
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index eff1594e4..a9e021f81 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -16968,6 +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"/>
 
   <child>
     <widget class="GtkVBox" id="vbox97">