diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java
index 9825d29b04cec7c9e3b50166b2cfca03f5485b68..9530df294f934f95335fdda5aca09edfd47025ea 100644
--- a/src/com/android/email/activity/FolderMessageList.java
+++ b/src/com/android/email/activity/FolderMessageList.java
@@ -897,8 +897,11 @@ public class FolderMessageList extends ExpandableListActivity
 	
 	private void onToggleSortAscending()
   {
-	  sortAscending = !sortAscending;
-    MessagingController.getInstance(getApplication()).setSortAscending(sortType, sortAscending);
+    MessagingController.getInstance(getApplication()).setSortAscending(sortType, !sortAscending);
+
+    sortAscending = MessagingController.getInstance(getApplication()).isSortAscending(sortType);
+    sortDateAscending = MessagingController.getInstance(getApplication()).isSortAscending(SORT_TYPE.SORT_DATE);
+    
 	  reSort();
   }