diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3dd7a4b52..d3cb7234b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -211,7 +211,7 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="notification_additional_messages">i <xliff:g id="additional_messages">%d</xliff:g> més a <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Respon</string>
-    <string name="notification_action_read">Mostra</string>
+    <string name="notification_action_mark_as_read">Mostra</string>
     <string name="notification_action_delete">Elimina</string>
     <string name="notification_certificate_error_title">Error en el certificat de <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Comproveu els paràmetres del servidor.</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ce63af130..e1acb7792 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -215,7 +215,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> více v <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Odpovědět</string>
-    <string name="notification_action_read">Přečteno</string>
+    <string name="notification_action_mark_as_read">Přečteno</string>
     <string name="notification_action_delete">Smazat</string>
     <string name="notification_certificate_error_title">Chyba certifikátu pro <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Zkontrolujte nastavení serveru</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 82a3f2af9..2bc1c7ad6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -211,7 +211,7 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 200fdb7f7..b0d56691e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -211,7 +211,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="notification_additional_messages">und <xliff:g id="additional_messages">%d</xliff:g> weitere (<xliff:g id="account">%s</xliff:g>)</string>
 
     <string name="notification_action_reply">Antworten</string>
-    <string name="notification_action_read">Gelesen</string>
+    <string name="notification_action_mark_as_read">Gelesen</string>
     <string name="notification_action_delete">Löschen</string>
     <string name="notification_certificate_error_title">Zertifikatsproblem (<xliff:g id="account">%s</xliff:g>)</string>
     <string name="notification_certificate_error_text">Servereinstellungen überprüfen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index fa02b02c8..e50b7009d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -206,7 +206,7 @@
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> περισσότερα στον <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Απάντηση</string>
-    <string name="notification_action_read">Ανάγνωση</string>
+    <string name="notification_action_mark_as_read">Ανάγνωση</string>
     <string name="notification_action_delete">Διαγραφή</string>
     <string name="notification_certificate_error_title">Σφάλμα πιστοποιητικού για <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Ελέγξτε τις ρυθμίσεις του εξυπηρετητή</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9edbdf537..09c514615 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -210,7 +210,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d6f318075..368c03272 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -212,7 +212,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> viestiä lisää tilillä <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Vastaa</string>
-    <string name="notification_action_read">Lue</string>
+    <string name="notification_action_mark_as_read">Lue</string>
     <string name="notification_action_delete">Poista</string>
     <string name="notification_certificate_error_title">Varmennevirhe tilissä <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Tarkista palvelinasetuksesi</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d35043a67..5c5141501 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -236,7 +236,7 @@ de plus</string>
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> sur <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Répondre</string>
-    <string name="notification_action_read">Lire</string>
+    <string name="notification_action_mark_as_read">Lire</string>
     <string name="notification_action_delete">Supprimer</string>
     <string name="notification_certificate_error_title">Erreur de certificat (<xliff:g id="account">%s</xliff:g>)</string>
     <string name="notification_certificate_error_text">Vérifier les paramètres serveur</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 97581ee85..f462d2e9d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -210,7 +210,7 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 059ed116c..17f7dce6e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -211,7 +211,7 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index af6185e26..0895b83fc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -211,7 +211,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> altri su <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Rispondi</string>
-    <string name="notification_action_read">Letto</string>
+    <string name="notification_action_mark_as_read">Letto</string>
     <string name="notification_action_delete">Elimina</string>
     <string name="notification_certificate_error_title">Errore di certificato per <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Controlla le impostazioni del server</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f36c0ce3f..4223e33bf 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -211,7 +211,7 @@
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b90ed12ac..6271b2adb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -210,7 +210,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">返信</string>
-    <string name="notification_action_read">既読</string>
+    <string name="notification_action_mark_as_read">既読</string>
     <string name="notification_action_delete">削除</string>
     <string name="notification_certificate_error_title"><xliff:g id="account">%s</xliff:g>の証明書エラー</string>
     <string name="notification_certificate_error_text">サーバの設定を確認してください</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 54a6e2bd4..f2beeb9a1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -209,7 +209,7 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> 통의 메일 추가됨 (<xliff:g id="account">%s</xliff:g>)</string>
 
     <string name="notification_action_reply">답장</string>
-    <string name="notification_action_read">읽음</string>
+    <string name="notification_action_mark_as_read">읽음</string>
     <string name="notification_action_delete">삭제</string>
     <string name="notification_certificate_error_title">계정 인증 오류 (<xliff:g id="account">%s</xliff:g>)</string>
     <string name="notification_certificate_error_text">서버 설정을 점검하십시오.</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2b888dd79..d1329546b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -210,7 +210,7 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c22081248..c4967bea2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -216,7 +216,7 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> więcej na <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Odpowiedz</string>
-    <string name="notification_action_read">Oznacz jako przeczytane</string>
+    <string name="notification_action_mark_as_read">Oznacz jako przeczytane</string>
     <string name="notification_action_delete">Usuń</string>
     <string name="notification_certificate_error_title">Błąd certyfikatu dla <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Sprawdź ustawienia serwera</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 4e63ca699..8cde88d8f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -207,7 +207,7 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> mais em <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Responder</string>
-    <string name="notification_action_read">Lido</string>
+    <string name="notification_action_mark_as_read">Lido</string>
     <string name="notification_action_delete">Excluir</string>
     <string name="notification_certificate_error_title">Erro no certificado de <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Verifique suas configurações de servidor</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index df4392a5d..b08967528 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -206,7 +206,7 @@ K-9 Mail — почтовый клиент для Android.
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> в <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Ответить</string>
-    <string name="notification_action_read">Открыть</string>
+    <string name="notification_action_mark_as_read">Открыть</string>
     <string name="notification_action_delete">Удалить</string>
     <string name="notification_certificate_error_title">Ошибка сертификата <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Проверьте настройки сервера</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ef4c8c562..ee579a7a1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -211,7 +211,7 @@ Prosím nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte s
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> viac v <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Odpovedať</string>
-    <string name="notification_action_read">Ozn. ako prečítané</string>
+    <string name="notification_action_mark_as_read">Ozn. ako prečítané</string>
     <string name="notification_action_delete">Zmazať</string>
     <string name="notification_certificate_error_title">Chyba certifikátu pre <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Skontrolujte nastavenia serveru</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0174b1c1f..271c0efcd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -211,7 +211,7 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> ytterligare på <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Svara</string>
-    <string name="notification_action_read">Markera som läst</string>
+    <string name="notification_action_mark_as_read">Markera som läst</string>
     <string name="notification_action_delete">Radera</string>
     <string name="notification_certificate_error_title">Certificatsfel för <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Kontrollera dina serverinställningar</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d3efcac14..9091a08bf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -211,7 +211,7 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 17a44141a..b3e2723b7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -211,7 +211,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a3dd2de99..1665c206a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -204,7 +204,7 @@ K-9改进的功能包括：
     <!-- NEW: <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>-->
 
     <!-- NEW: <string name="notification_action_reply">Reply</string>-->
-    <!-- NEW: <string name="notification_action_read">Mark Read</string>-->
+    <!-- NEW: <string name="notification_action_mark_as_read">Mark Read</string>-->
     <!-- NEW: <string name="notification_action_delete">Delete</string>-->
     <!-- NEW: <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>-->
     <!-- NEW: <string name="notification_certificate_error_text">Check your server settings</string>-->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8e9c189e1..f73c2bc5b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -178,7 +178,7 @@
     <string name="notification_additional_messages" formatted="false">+ 來自%s已超過%d則訊息 </string>
 
     <string name="notification_action_reply">回覆</string>
-    <string name="notification_action_read">開啟</string>
+    <string name="notification_action_mark_as_read">開啟</string>
     <string name="notification_action_delete">刪除</string>
     <string name="notification_certificate_error_title">驗證失敗</string>
     <string name="notification_certificate_error_text">檢查你的伺服器設定</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49309073a..b306f4420 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -216,7 +216,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%d</xliff:g> more on <xliff:g id="account">%s</xliff:g></string>
 
     <string name="notification_action_reply">Reply</string>
-    <string name="notification_action_read">Mark Read</string>
+    <string name="notification_action_mark_as_read">Mark Read</string>
     <string name="notification_action_delete">Delete</string>
     <string name="notification_certificate_error_title">Certificate error for <xliff:g id="account">%s</xliff:g></string>
     <string name="notification_certificate_error_text">Check your server settings</string>
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 0dd1efc97..586bfb57e 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -4888,7 +4888,7 @@ public class MessagingController implements Runnable {
             }
 
             builder.addAction(R.drawable.ic_action_mark_as_read_dark,
-                    context.getString(R.string.notification_action_read),
+                    context.getString(R.string.notification_action_mark_as_read),
                     NotificationActionService.getReadAllMessagesIntent(context, account, allRefs));
 
             NotificationQuickDelete deleteOption = K9.getNotificationQuickDeleteBehaviour();