diff --git a/res/menu/message_list_item_context.xml b/res/menu/message_list_item_context.xml
index 24b48bd97..4de1f886d 100644
--- a/res/menu/message_list_item_context.xml
+++ b/res/menu/message_list_item_context.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
      <item
+        android:id="@+id/select"
+        android:title="@string/select_action"/>
+    <item android:id="@+id/deselect"
+          android:title="@string/deselect_action"/>
+    <item
          android:id="@+id/reply_all"
          android:title="@string/reply_all_action"/>
      <item
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a807b93fb..e5930715b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -118,6 +118,8 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="cancel_action">Cancel·la</string>
     <string name="send_action">Envia</string>
     <string name="send_again_action">Torna a enviar</string>
+    <string name="select_action">Selecciona</string>
+    <string name="deselect_action">Desselecciona</string>
     <string name="reply_action">Respon</string>
     <string name="reply_all_action">Respon a tothom</string>
     <string name="delete_action">Esborra</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 17cbe380b..9e03a860e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -122,6 +122,8 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="cancel_action">Zrušit</string>
     <string name="send_action">Odeslat</string>
     <string name="send_again_action">Odeslat znovu</string>
+    <string name="select_action">Vybrat</string>
+    <string name="deselect_action">Zrušit výběr</string>
     <string name="reply_action">Odpovědět</string>
     <string name="reply_all_action">Odpovědět všem</string>
     <string name="delete_action">Smazat</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c92a34e46..664277160 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -118,6 +118,8 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="cancel_action">Fortryd</string>
     <string name="send_action">Send</string>
     <string name="send_again_action">Send igen</string>
+    <string name="select_action">Vælg</string>
+    <string name="deselect_action">Fravælg</string>
     <string name="reply_action">Svar</string>
     <string name="reply_all_action">Svar alle</string>
     <string name="delete_action">Slet</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0bbd6e9f3..3e94ef028 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -117,6 +117,8 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="cancel_action">Abbrechen</string>
     <string name="send_action">Senden</string>
     <string name="send_again_action">Erneut senden</string>
+    <string name="select_action">Auswählen</string>
+    <string name="deselect_action">Abwählen</string>
     <string name="reply_action">Antworten</string>
     <string name="reply_all_action">Allen antworten</string>
     <string name="delete_action">Löschen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 92863b7c3..5c333b305 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -117,6 +117,8 @@
     <string name="cancel_action">Άκυρο</string>
     <string name="send_action">Αποστολή</string>
     <string name="send_again_action">Αποστολή πάλι</string>
+    <string name="select_action">Επιλογή</string>
+    <string name="deselect_action">Απο-επιλογή</string>
     <string name="reply_action">Απάντηση</string>
     <string name="reply_all_action">Απάντηση σε όλους</string>
     <string name="delete_action">Διαγραφή</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ad753109f..09f02569c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -118,6 +118,8 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Reenviar al remitente</string>
+    <string name="select_action">Seleccionar</string>
+    <string name="deselect_action">Deseleccionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Borrar</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 57424f5d8..9e1388a94 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -119,6 +119,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="cancel_action">Peruuta</string>
     <string name="send_action">Lähetä</string>
     <string name="send_again_action">Lähetä uudelleen</string>
+    <string name="select_action">Valitse</string>
+    <string name="deselect_action">Poista valinta</string>
     <string name="reply_action">Vastaa</string>
     <string name="reply_all_action">Vastaa kaikille</string>
     <string name="delete_action">Poista</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 22a4fe229..3ac6e03e6 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -118,6 +118,8 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Volver a enviar</string>
+    <string name="select_action">Seleccionar</string>
+    <string name="deselect_action">Deseleccionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Borrar</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d19a7673d..8a0f813a8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -119,6 +119,8 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <string name="cancel_action">Mégse</string>
     <string name="send_action">Küldés</string>
     <string name="send_again_action">Újraküldés</string>
+    <string name="select_action">Megjelöl</string>
+    <string name="deselect_action">Nem jelöl</string>
     <string name="reply_action">Válasz</string>
     <string name="reply_all_action">Válasz mindenkinek</string>
     <string name="delete_action">Törlés</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 40579864f..4dd40c8d1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -118,6 +118,8 @@
     <string name="cancel_action">ביטול</string>
     <string name="send_action">שלח</string>
     <string name="send_again_action">שלח שוב</string>
+    <string name="select_action">בחר</string>
+    <string name="deselect_action">בטל בחירה</string>
     <string name="reply_action">השב</string>
     <string name="reply_all_action">השב על הכל</string>
     <string name="delete_action">מחק</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5f2160f22..e97170e9f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -118,6 +118,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="cancel_action">キャンセル</string>
     <string name="send_action">送信</string>
     <string name="send_again_action">再編集</string>
+    <string name="select_action">選択</string>
+    <string name="deselect_action">選択解除</string>
     <string name="reply_action">返信</string>
     <string name="reply_all_action">全員に返信</string>
     <string name="delete_action">削除</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 63c838021..a804c7ff3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -117,6 +117,8 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="cancel_action">취소</string>
     <string name="send_action">전송</string>
     <string name="send_again_action">재전송</string>
+    <string name="select_action">선택</string>
+    <string name="deselect_action">선택 해제</string>
     <string name="reply_action">회신</string>
     <string name="reply_all_action">전체회신</string>
     <string name="delete_action">지우기</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d0827bf83..23dcd2317 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -118,6 +118,8 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <string name="cancel_action">Annuleren</string>
     <string name="send_action">Verzenden</string>
     <string name="send_again_action">Opnieuw Verzenden</string>
+    <string name="select_action">Selecteren</string>
+    <string name="deselect_action">Annuleer selectie</string>
     <string name="reply_action">Antwoorden</string>
     <string name="reply_all_action">Iedereen antwoorden</string>
     <string name="delete_action">Verwijderen</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 410cfa1ba..5545e1be2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -128,6 +128,8 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="cancel_action">Anuluj</string>
     <string name="send_action">Wyślij</string>
     <string name="send_again_action">Prześlij ponownie</string>
+    <string name="select_action">Zaznacz</string>
+    <string name="deselect_action">Odznacz</string>
     <string name="reply_action">Odpowiedz</string>
     <string name="reply_all_action">Odpowiedz wszystkim</string>
     <string name="delete_action">Usuń</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4ad8a2d0d..26141ee30 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -118,6 +118,8 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="cancel_action">Cancelar</string>
     <string name="send_action">Enviar</string>
     <string name="send_again_action">Reenviar</string>
+    <string name="select_action">Selecionar</string>
+    <string name="deselect_action">Desselecionar</string>
     <string name="reply_action">Responder</string>
     <string name="reply_all_action">Responder a todos</string>
     <string name="delete_action">Excluir</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a05390a03..60f340d37 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -119,6 +119,8 @@ K-9 Mail — почтовый клиент для Android.
     <string name="cancel_action">Отмена</string>
     <string name="send_action">Отправить</string>
     <string name="send_again_action">Редактировать</string>
+    <string name="select_action">Выбрать</string>
+    <string name="deselect_action">Сброс выбора</string>
     <string name="reply_action">Ответить</string>
     <string name="reply_all_action">Ответить всем</string>
     <string name="delete_action">Удалить</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e4d27cefa..d7b2b1300 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -118,6 +118,8 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="cancel_action">Avbryt</string>
     <string name="send_action">Skicka</string>
     <string name="send_again_action">Skicka igen</string>
+    <string name="select_action">Markera</string>
+    <string name="deselect_action">Avmarkera</string>
     <string name="reply_action">Svara</string>
     <string name="reply_all_action">Svara alla</string>
     <string name="delete_action">Radera</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e83262e26..1412c1d7f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -118,6 +118,8 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="cancel_action">İptal</string>
     <string name="send_action">Gönder</string>
     <string name="send_again_action">Tekrar Gönder</string>
+    <string name="select_action">Seç</string>
+    <string name="deselect_action">Kaldır</string>
     <string name="reply_action">Cevap</string>
     <string name="reply_all_action">Hepsini Cevapla</string>
     <string name="delete_action">Sil</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b43ae62f3..52c0256cb 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -118,6 +118,8 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="cancel_action">Відмінити</string>
     <string name="send_action">Надіслати</string>
     <string name="send_again_action">Надіслати знову</string>
+    <string name="select_action">Вибрати</string>
+    <string name="deselect_action">Скасувати вибір</string>
     <string name="reply_action">Відповісти</string>
     <string name="reply_all_action">Відповісти всім</string>
     <string name="delete_action">Видалити</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index abe220f57..1ad1d1f60 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -117,6 +117,8 @@ K-9改进的功能包括：
     <string name="cancel_action">取消</string>
     <string name="send_action">发送</string>
     <string name="send_again_action">重新发送</string>
+    <string name="select_action">选择</string>
+    <string name="deselect_action">取消选择</string>
     <string name="reply_action">回复</string>
     <string name="reply_all_action">全部回复</string>
     <string name="delete_action">删除</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 53f535cb4..49c37c061 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -91,6 +91,8 @@
     <string name="cancel_action">取消</string>
     <string name="send_action">寄送</string>
     <string name="send_again_action">再次寄送</string>
+    <string name="select_action">選擇</string>
+    <string name="deselect_action">取消選擇</string>
     <string name="reply_action">回覆</string>
     <string name="reply_all_action">全部回覆</string>
     <string name="delete_action">刪除</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5d92b2860..946cdb45f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -123,6 +123,8 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="cancel_action">Cancel</string>
     <string name="send_action">Send</string>
     <string name="send_again_action">Send Again</string>
+    <string name="select_action">Select</string>
+    <string name="deselect_action">Deselect</string>
     <string name="reply_action">Reply</string>
     <string name="reply_all_action">Reply all</string>
     <string name="delete_action">Delete</string>
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index f369d8988..54302e61f 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1474,6 +1474,11 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         }
 
         switch (item.getItemId()) {
+            case R.id.deselect:
+            case R.id.select: {
+                toggleMessageSelectWithAdapterPosition(adapterPosition);
+                break;
+            }
             case R.id.reply: {
                 Message message = getMessageAtPosition(adapterPosition);
                 onReply(message);
@@ -1581,6 +1586,12 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
 
         menu.setHeaderTitle(subject);
 
+        if(  mSelected.contains(mContextMenuUniqueId)) {
+            menu.findItem(R.id.select).setVisible(false);
+        } else {
+            menu.findItem(R.id.deselect).setVisible(false);
+        }
+
         if (read) {
             menu.findItem(R.id.mark_as_read).setVisible(false);
         } else {