diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 81e4917dc..26a9f8813 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -9,9 +9,9 @@
         android:title="@string/select_action"
     />
     <item
-        android:id="@+id/unselect"
+        android:id="@+id/deselect"
 		android:visible="false"
-        android:title="@string/unselect_action"
+        android:title="@string/deselect_action"
     />
 	<item
 		android:id="@+id/delete"
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 0cdde7d23..3f118587d 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -85,8 +85,8 @@
 				android:title="@string/batch_select_all"
 			/>
 			<item
-				android:id="@+id/batch_unselect_all"
-				android:title="@string/batch_unselect_all"
+				android:id="@+id/batch_deselect_all"
+				android:title="@string/batch_deselect_all"
 			/>
 		</menu>
 	</item>			
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5523b4a99..959225f40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -36,7 +36,7 @@
     <string name="cancel_action">Cancel</string>
     <string name="send_action">Send</string>
     <string name="select_action">Select</string>
-    <string name="unselect_action">Unselect</string>
+    <string name="deselect_action">Unselect</string>
     <string name="reply_action">Reply</string>
     <string name="reply_all_action">Reply all</string>
     <string name="delete_action">Delete</string>
@@ -629,7 +629,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="batch_select_mode">Select mode</string>
     <string name="batch_plain_mode">Plain mode</string>
     <string name="batch_select_all">Select all</string>
-    <string name="batch_unselect_all">Done</string>
+    <string name="batch_deselect_all">Done</string>
     
     <string name="account_setup_push_limit_label">Max folders to check with push</string>
     <string name="account_setup_push_limit_10">10 folders</string>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 44e08dcb5..563416128 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1114,7 +1114,7 @@ public class MessageList
                 toggleBatchButtons();
                 return true;
 
-            case R.id.batch_unselect_all:
+            case R.id.batch_deselect_all:
                 setAllSelected(false);
                 toggleBatchButtons();
                 return true;
@@ -1161,7 +1161,7 @@ public class MessageList
 
     private final int[] batch_ops = { R.id.batch_copy_op, R.id.batch_delete_op, R.id.batch_flag_op,
                                       R.id.batch_unflag_op, R.id.batch_mark_read_op, R.id.batch_mark_unread_op, R.id.batch_move_op ,
-                                      R.id.batch_select_all, R.id.batch_unselect_all
+                                      R.id.batch_select_all, R.id.batch_deselect_all
                                     };
 
 
@@ -1198,7 +1198,7 @@ public class MessageList
         menu.findItem(R.id.batch_unflag_op).setVisible(!newFlagState);
         menu.findItem(R.id.batch_mark_read_op).setVisible(newReadState);
         menu.findItem(R.id.batch_mark_unread_op).setVisible(!newReadState);
-        menu.findItem(R.id.batch_unselect_all).setVisible(anySelected);
+        menu.findItem(R.id.batch_deselect_all).setVisible(anySelected);
         menu.findItem(R.id.batch_select_all).setEnabled(true);
         // TODO: batch move and copy not yet implemented
         menu.findItem(R.id.batch_move_op).setVisible(false);
@@ -1248,7 +1248,7 @@ public class MessageList
                 setSelected(holder, true);
                 break;
 
-            case R.id.unselect:
+            case R.id.deselect:
                 setSelected(holder, false);
                 break;
 
@@ -1397,12 +1397,12 @@ public class MessageList
         if (message.selected)
         {
             menu.findItem(R.id.select).setVisible(false);
-            menu.findItem(R.id.unselect).setVisible(true);
+            menu.findItem(R.id.deselect).setVisible(true);
         }
         else
         {
             menu.findItem(R.id.select).setVisible(true);
-            menu.findItem(R.id.unselect).setVisible(false);
+            menu.findItem(R.id.deselect).setVisible(false);
         }
 
     }