diff --git a/mail/ChangeLog b/mail/ChangeLog
index d4a9c8912f..56918b19fb 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #563954
+
+	* message-list.c: (regen_list_exec): Sort UIDs before
+	using them to obtain proper order when without sorting.
+
 2009-04-24  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #552583
diff --git a/mail/message-list.c b/mail/message-list.c
index a2a9989bda..c98ce04ace 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4169,6 +4169,8 @@ regen_list_exec (struct _regen_list_msg *m)
 
 	//camel_folder_summary_reload_from_db (m->folder->summary, NULL);
 	if (!camel_operation_cancel_check(m->base.cancel)) {
+		camel_folder_sort_uids (m->folder, showuids);
+
 		/* update/build a new tree */
 		if (m->dotree) {
 			if (m->tree)