diff --git a/res/menu/conversation_list_batch.xml b/res/menu/conversation_list_batch.xml
index a2b2b1b0ee..e7a965462f 100644
--- a/res/menu/conversation_list_batch.xml
+++ b/res/menu/conversation_list_batch.xml
@@ -6,7 +6,7 @@
           android:icon="@drawable/ic_menu_trash_holo_dark"
           android:showAsAction="ifRoom" />
 
-    <item android:title="@string/menu_select_all"
+    <item android:title="@string/menu_select_all2"
           android:id="@+id/menu_select_all"
           android:icon="@drawable/ic_menu_selectall_holo_dark" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02af3f713e..7ae1b98c57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -232,10 +232,6 @@
     <string name="passphrase">Passphrase:</string>
     <string name="repeat">Repeat:</string>
     
-    <!-- mms_download_view -->
-    <string name="download">Download</string>
-    <string name="downloading">Downloading</string>
-    
     <!-- receive_key_activity -->
     <string name="session">Session</string>
     <string name="identities">Identities</string>
@@ -349,7 +345,7 @@
     
     <!-- conversation_list_batch -->
     <string name="menu_delete_selected">Delete Selected</string>
-    <string name="menu_select_all">Select All</string>
+    <string name="menu_select_all2">Select All</string>
     
     <!-- conversation_list -->
     <string name="menu_search">Search</string>