feat(email): update localized email messages

- add translations for network errors and signature details - update account, message, recipient, and security wording - refresh source locations after email code changes - mark obsolete translations as vanished across locales - add German, Spanish, French, Italian, Polish, Russian, and Chinese translations for new messages
author: saturneric <[email protected]> 2026-09-13 18:52:01 +0200
committer: saturneric <[email protected]> 2026-09-13 18:52:01 +0200
commit: b21cc52db286ed33ee99374c28a5949b4f5dec38 (patch)
tree: fee9c162365a783771ae57b52a82d91fa67ff00c /src
parent: i18n(key-server): complete Russian translations (diff)
download: modules-b21cc52db286ed33ee99374c28a5949b4f5dec38.tar.gz
modules-b21cc52db286ed33ee99374c28a5949b4f5dec38.zip
9 files changed, 6775 insertions, 3710 deletions
diff --git a/src/m_email/ts/ModuleEMail.de_DE.ts b/src/m_email/ts/ModuleEMail.de_DE.ts
index 66514af..5b3124f 100644
--- a/src/m_email/ts/ModuleEMail.de_DE.ts
+++ b/src/m_email/ts/ModuleEMail.de_DE.ts
@@ -224,8 +224,12 @@ Das gespeicherte Passwort wird ebenfalls verworfen. Dies kann nicht rückgängig
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Ein anderes Konto verwendet diese Adresse bereits. Sie können, wo auch immer Konten angeboten werden, nicht unterschieden werden.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Ein anderes Konto verwendet diese Adresse bereits. Sie können dort, wo Konten angeboten werden, nicht unterschieden werden.</translation>
+        <translation type="vanished">Ein anderes Konto verwendet diese Adresse bereits. Sie können dort, wo Konten angeboten werden, nicht unterschieden werden.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Verwenden Sie Aktualisieren, um es erneut zu versuchen.</translation>
         <translation>Wählen Sie ein Konto zum Öffnen.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>Für dieses Konto ist kein Passwort gespeichert. Legen Sie eines in den Einstellungen unter E-Mail-Konten fest und klicken Sie dann auf „Erneut versuchen“.</translation>
+        <translation type="vanished">Für dieses Konto ist kein Passwort gespeichert. Legen Sie eines in den Einstellungen unter E-Mail-Konten fest und klicken Sie dann auf „Erneut versuchen“.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Verwenden Sie Aktualisieren, um es erneut zu versuchen.</translation>
         <translation>Datum nicht angegeben</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>Diese Nachricht ist größer, als diese Anwendung öffnen kann, daher kann sie nicht importiert werden.</translation>
+        <translation type="vanished">Diese Nachricht ist größer, als diese Anwendung öffnen kann, daher kann sie nicht importiert werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>Für dieses Konto ist kein Passwort gespeichert. Legen Sie eines in den Einstellungen unter Mail-Konten fest und verwenden Sie dann Aktualisieren.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>Diese Nachricht ist zu groß, als dass diese Anwendung sie öffnen kann, daher kann sie nicht importiert werden.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Verwenden Sie Aktualisieren, um es erneut zu versuchen.</translation>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML ist ein Dateiformat zur Darstellung von E-Mail-Nachrichten, das typischerwei
 Nach der Korrektur der EML-Daten versuchen Sie den Vorgang erneut.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ Während des E-Mail-Vorgangs ist ein Fehler aufgetreten. Der Vorgang konnte nich
 Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support oder konsultieren Sie die Dokumentation.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
         <translation type="vanished">Algorithmus zur Nachrichtenintegritätsprüfung</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Digest der signierten MIME-Entität (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Deklarierter Signatur-Hash (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Anhänge</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Verschlüsselungsempfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>Schlüssel-ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>verschlüsselt an</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>verschlüsselt an, nicht in den Kopfzeilen</translation>
+        <translation type="vanished">verschlüsselt an, nicht in den Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Versteckter Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>Der Absender hat diese Schlüssel-ID nicht angegeben</translation>
+        <translation type="vanished">Der Absender hat diese Schlüssel-ID nicht angegeben</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Empfängerprüfung</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>DETAILS</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>EMPFÄNGER</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>UNTERZEICHNER</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Vor dem Export prüfen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>Diese Nachricht enthält etwas, das vor dem Speichern geprüft werden sollte.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>Die von der Signatur abgedeckten Bytes wurden nach deren Erstellung neu geschrieben: Ihre Zeilenenden sind nicht mehr CRLF. Dies wird normalerweise durch ein Programm verursacht, das sie beim Speichern oder Kopieren der Nachricht geändert hat. Zum Prüfen der Signatur sind die ursprünglichen Bytes erforderlich.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>Die Signatur ist gültig, und der Schlüssel, der sie erstellt hat, spricht für die Adresse, von der diese Nachricht laut Angabe stammt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>Die Signatur selbst ist gültig, aber der Schlüssel, der sie erstellt hat, spricht nicht für die Adresse, von der diese Nachricht laut Angabe stammt. So sieht eine Signatur aus, die aus einer anderen Nachricht übernommen wurde. Es lohnt sich also zu prüfen, wer der Unterzeichner ist, bevor man dem Inhalt vertraut.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>Der Schlüssel, der diese Signatur erstellt hat, befindet sich nicht in Ihrem Schlüsselbund. Daher kann hier nichts aussagen, ob die Signatur echt ist. Importieren Sie den Schlüssel des Absenders und verifizieren Sie erneut.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>Die Signatur wurde mit einem Schlüssel erstellt, der abgelaufen ist, oder die Signatur selbst ist abgelaufen. Sie kann dennoch echt sein; was sich nicht bestätigen lässt, ist, dass der Schlüssel zum Zeitpunkt seiner Verwendung gültig war.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>Die Signatur stimmt nicht mit den Bytes überein, die sie abdeckt. Entweder wurde die Nachricht nach der Unterzeichnung geändert, oder die Signatur wurde nicht für diese Nachricht erstellt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>Die Prüfung konnte nicht abgeschlossen werden, daher ist nichts über diese Signatur bekannt. Dies ist keine Aussage darüber, dass die Signatur ungültig ist.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Diese Nachricht behauptet, eine OpenPGP-Signatur zu enthalten, aber ihre Struktur ist nicht stabil genug, um eine zu prüfen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Die Signaturen in dieser Nachricht decken die verschlüsselten Daten ab und nicht den Inhalt, den Sie lesen. Sie bestätigen, wer die Nachricht verschlüsselt hat, sagen aber nichts darüber aus, wer den Inhalt verfasst hat.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>In dieser Nachricht war keine Signatur zu prüfen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Hinweis**: Der signierte Teil liegt nicht in kanonischer Form vor, da seine Zeilenenden nicht CRLF sind. Etwas hat diese Nachricht nach der Signierung umgeschrieben; das ist in der Regel ein Programm, das beim Speichern oder Kopieren die Zeilenenden geändert hat. Eine Signatur kann gegen diese Bytes nicht verifiziert werden, und das Importieren des Schlüssels des Absenders wird das nicht ändern.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>E-Mail verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, ein OpenPGP-Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, nicht von der Signatur abgedeckt</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>in %1, aber nicht an ihn verschlüsselt: kann nicht gelesen werden</translation>
+        <translation type="vanished">in %1, aber nicht an ihn verschlüsselt: kann nicht gelesen werden</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>E-Mail entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>E-Mail signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>E-Mail verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>E-Mail verschlüsseln und signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Diese Nachricht ist nicht signiert, daher gibt es keine Signatur zu prüfen. Sie wurde erfolgreich entschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Der entschlüsselte Inhalt ist keine MIME-Nachricht, daher gibt es keine Signatur zu prüfen. Er wurde erfolgreich entschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Diese Nachricht wurde entschlüsselt. Sie trägt keine Signatur, also steht hier nichts darüber, wer sie gesendet hat.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>E-Mail entschlüsseln und verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Datei speichern</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>E-Mail-Nachricht (*.eml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>in %1, aber nicht an %1 verschlüsselt: sie können diese Nachricht nicht lesen</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>verschlüsselt an, aber nicht in den Kopfzeilen aufgeführt</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>Der Absender hat diese Schlüssel-ID nicht angegeben.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Datei %1 kann nicht geschrieben werden:
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 ist keine gewöhnliche Datei und kann daher nicht als Nachricht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>Die Datei %1 ist zu groß (%2), um geöffnet zu werden. Die maximal zulässige Größe beträgt %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
         <translation type="vanished">Die Datei %1 ist zu groß (%2 Bytes), um geöffnet zu werden. Die maximal zulässige Größe beträgt 1 MB.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Datei %1 kann nicht gelesen werden:
@@ -1116,359 +1189,373 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
+        <translation type="vanished">Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Bcc</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>An:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Senden...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Senden Sie diese Nachricht über ein konfiguriertes E-Mail-Konto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Schreiben Sie hier Ihre Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Fügen Sie dieser Nachricht eine oder mehrere Dateien hinzu. Dateien können auch auf die Nachricht gezogen werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Entfernen Sie die ausgewählten Anhänge aus dieser Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Ausgewählte Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Alle Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Diese Nachricht ist verschlüsselt. Entschlüsseln Sie sie vor dem Bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Diese Nachricht ist verschlüsselt und signiert. Entschlüsseln Sie sie und entfernen Sie dann die Signatur, bevor Sie die Nachricht bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Rohquelle</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Geschützte Nachricht</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Diese Bytes sind durch eine Signatur abgedeckt oder sind Chiffrat. Entfernen Sie die Signatur oder entschlüsseln Sie die Nachricht, bevor Sie die Quelle bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Bearbeitung beenden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Rohquelle bearbeiten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Sie bearbeiten die Rohquelle der Nachricht. Was Sie hier eingeben, ist das Dokument.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Diese Nachricht ist zur Überprüfung gesperrt. Ihre Quelle kann nicht bearbeitet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Schreibgeschützt. Entsperren Sie, um die Nachrichtenquelle direkt zu bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Diese Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Diese Nachricht ist verschlüsselt und signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Die Empfänger werden in den Kopfzeilen nicht genannt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Adressiert an %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>Die Empfänger sind nicht benannt, sodass sich nicht feststellen lässt, ob Sie diese Nachricht öffnen können, bis Sie es versuchen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>öffentlichen Schlüssel anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>Text zu dieser Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Nachricht gesperrt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Diese Nachricht ist nur zur Ansicht geöffnet, daher ist es nicht möglich, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Entschlüsseln Sie diese Nachricht, bevor Sie versuchen, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Nachricht ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>Dies ist ein Entwurf, den Sie noch schreiben, keine empfangene Nachricht, daher gibt es hier noch nichts zu tun.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Diese Nachricht kann ohnehin nicht bearbeitet werden: Sie ist signiert oder verschlüsselt und daher bereits vor dem Umschreiben geschützt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Es ist noch kein E-Mail-Konto eingerichtet. Fügen Sie unter Einstellungen bei den E-Mail-Konten eines hinzu, dann kann diese Nachricht gesendet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Geben Sie an, von wem diese Nachricht stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Die Absenderadresse sieht nicht wie eine E-Mail-Adresse aus.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Fügen Sie mindestens einen Empfänger hinzu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Geben Sie dieser Nachricht einen Betreff.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Dies sieht nicht wie eine E-Mail-Adresse aus: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>Signatur konnte nicht überprüft werden</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Fehlerhafte OpenPGP-Struktur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>Weder signiert noch verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Diese Nachricht ist zur Ansicht gesperrt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Verschlüsseln...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Verschlüsseln und Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Signatur verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Signaturdetails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Erneut mit einem anderen Schlüssel signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Signatur entfernen...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Entschlüsseln und Verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Verschlüsselungsdetails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Details...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Entschlüsseln Sie zuerst diese Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Was ist mit dieser Nachricht nicht in Ordnung?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Trotzdem verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Trotzdem entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Signatur nicht erreichbar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Die Signatur befindet sich im verschlüsselten Teil dieser Nachricht. Entschlüsseln Sie zuerst die Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Nichts zu entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Diese Nachricht enthält keine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>Signatur kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Diese Nachricht folgt RFC 3156 nicht genau genug, um ihre Signatur sicher zu entfernen. Bearbeiten Sie stattdessen den Rohquelltext.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Signatur entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Die Signatur wird verworfen und die Nachricht wird eine normale unsignierte Nachricht. Die Nachricht selbst bleibt unverändert. Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>unsigniert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>Senden nicht möglich</translation>
+        <translation type="vanished">Senden nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Diese Nachricht benötigt einen Absender und mindestens einen Empfänger, bevor sie gesendet werden kann.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Struktur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Nachrichtendetails</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Blindkopie-Empfänger werden niemals in die Nachricht geschrieben: Eine Bcc-Kopfzeile würde jedem Empfänger zeigen, wer eine Blindkopie erhalten hat. Sie werden zur Auswahl der Verschlüsselungsempfänger verwendet und nicht zusammen mit der Datei gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Kopie und Blindkopie anzeigen (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Nachricht anzeigen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Rohes Dokument anzeigen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Eine Antwort an den Absender schreiben.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Allen antworten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Eine Antwort an den Absender und alle anderen Empfänger schreiben. Blindkopie-Empfänger sind nicht enthalten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Weiterleiten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Diese Nachricht mit ihren Anhängen weiterleiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Schreibgeschützt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Diese Nachricht sperren, damit sie nicht bearbeitet oder neu geschrieben werden kann. Antworten und Weiterleiten funktionieren weiterhin und erzeugen neue Nachrichten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Zeigen, was über diese Nachricht bekannt ist: ihre Signaturen, ihre Struktur und ihre Kopfzeilen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Datei anhängen...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Speichern...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Alle speichern...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Diese Nachricht ist nur zur Ansicht geöffnet. Sie kann nicht bearbeitet oder neu geschrieben werden; Antworten und Weiterleiten funktionieren weiterhin und erzeugen neue Nachrichten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Diese Nachricht ist signiert. Entfernen Sie die Signatur, bevor Sie sie bearbeiten. Eine Bearbeitung unter einer Signatur gilt als Fälschung.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Diese Nachricht wurde in HTML verfasst. Sie wird als Quelltext statt gerendert angezeigt: Es werden keine Bilder geladen und keine Links verfolgt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Schreibgeschützt. Diese Bytes sind geschützt. Entfernen Sie die Signatur oder entschlüsseln Sie die Nachricht, um sie zu bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Diese Nachricht konnte nicht zur Ansicht zusammengestellt werden, daher gibt es hier nichts anzuzeigen. Die Nachricht selbst ist unverändert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>Antworten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>Antwort an alle nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>Weiterleiten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Die Nachricht selbst wurde nicht geändert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>Von hier aus kann keine neue Nachricht geöffnet werden, da sich diese Ansicht nicht in einem Fenster mit Registerkarten befindet.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Die neue Nachricht konnte nicht zusammengestellt werden. Dies bedeutet in der Regel, dass ein Teil der Originalnachricht nicht neu kodiert werden konnte, meistens ein Anhang.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Eine Registerkarte für die neue Nachricht konnte nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>Die neue Registerkarte wurde geöffnet, zeigt aber keine Nachrichtenansicht, sodass die Antwort nirgendwo platziert werden kann. Die Registerkarte kann geschlossen werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>Die Empfänger sind nicht benannt, daher kann erst beim Versuch festgestellt werden, ob Sie diese Nachricht öffnen können.</translation>
+        <translation type="vanished">Die Empfänger sind nicht benannt, daher kann erst beim Versuch festgestellt werden, ob Sie diese Nachricht öffnen können.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Sie besitzen keinen privaten Schlüssel für eine dieser Adressen. Sofern die Nachricht nicht zusätzlich mit einem Schlüssel verschlüsselt wurde, der hier nicht genannt ist, kann sie auf diesem Computer nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>Sie besitzen den privaten Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>Sie besitzen private Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Verschlüsselt, Signatur nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Signatur nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Verschlüsselt, Signatur verifiziert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Signatur verifiziert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Signiert von einer anderen Adresse</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Signatur oder Schlüssel abgelaufen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Signiert von einem unbekannten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Ungültige Signatur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>signiert, nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>signiert, konnte nicht überprüft werden</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>Signatur nicht gut</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Einige Teile befinden sich außerhalb des signierten Abschnitts dieser Nachricht. Sie sind nicht von der Signatur abgedeckt und könnten von jedem hinzugefügt worden sein.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 Anhang</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 Anhänge</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>E-Mail-Nachricht (*.eml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>Senden nicht möglich</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Dateien anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 ist ein Ordner</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 ist keine normale Datei</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 ist zu groß (%2); die maximale Anhangsgröße ist %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Schlüssel importieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Namen kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Anhang öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Speichern Sie sie stattdessen und öffnen Sie sie selbst, wenn Sie sicher sind, woher sie stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Ein temporärer Ordner zum Öffnen von %1 konnte nicht erstellt werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>%1 konnte nicht zum Öffnen geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Auf diesem System ist nichts registriert, um %1 zu öffnen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Anhang entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurden, ist dies die einzige Kopie. Das Entfernen kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>1 Datei gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>%1 Dateien gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Anhang speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>%1 kann nicht geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Anhänge speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>Konnte nicht schreiben: %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
         <translation>gültig, mit Problemen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>gültig, Schlüssel nicht vollständig vertrauenswürdig</translation>
+        <translation type="vanished">gültig, Schlüssel nicht vollständig vertrauenswürdig</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
         <translation>Schlüssel aus dieser Nachricht importieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Signaturen verifizieren</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Erneut verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Signaturen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Signatur %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>umfasst %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>umfasst %1, %2 Ebenen tief</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Ergebnis</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>Dieser Abschnitt ist signiert, aber es wurde noch nichts verifiziert.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>Dieser Abschnitt ist signiert, aber die Verifizierung ergab kein Ergebnis: Der Signaturschlüssel befindet sich möglicherweise nicht in Ihrem Schlüsselbund.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Unbekannter Unterzeichner</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Andere Adresse</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>Die Signatur ist gültig, aber der Schlüssel gehört zu %1, während diese Nachricht besagt, dass sie von %2 stammt. Eine gültige Signatur sagt, wer die Bytes signiert hat, nicht wer die Nachricht gesendet hat.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Public-Key-Algorithmus</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Signiert am</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Deklarierter Hash (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Signatur-Hash</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>Hash-Abweichung</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>Die Nachricht deklariert %1, aber die Signatur verwendete %2.</translation>
+        <translation type="vanished">Die Nachricht deklariert %1, aber die Signatur verwendete %2.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>Adressiert und verschlüsselt an</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>Der Absender hat nicht festgehalten, wer dieser Empfänger ist.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Diese Nachricht gibt an, OpenPGP zu verwenden, aber ihre Struktur entspricht nicht RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>Zu dieser Nachricht gibt es nichts Weiteres zu berichten.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Schlüssel %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>gültig, aber der Schlüssel ist nicht vollständig vertrauenswürdig</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>die Nachricht gibt %1 an, aber die Signatur verwendet %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>in %1, aber nicht an %1 verschlüsselt: Diese Empfänger können diese Nachricht nicht lesen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>Verschlüsselt an, aber nicht in den sichtbaren Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Versteckter Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>Der Absender hat nicht festgehalten, wer dies ist</translation>
+        <translation type="vanished">Der Absender hat nicht festgehalten, wer dies ist</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Fingerabdruck</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>in %1, aber nicht an ihn verschlüsselt: sie können dies nicht lesen</translation>
+        <translation type="vanished">in %1, aber nicht an ihn verschlüsselt: sie können dies nicht lesen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>Die Engine meldete den Primärschlüssel anstelle des tatsächlich verwendeten Verschlüsselungs-Unterschlüssels.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Schlüssel für diese Adressen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>Kein Schlüssel gefunden</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>Schlüssel ist %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Identität</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>Diese Adresse befindet sich auf einer widerrufenen Benutzer-ID des Schlüssels.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>diese Adresse ist die primäre Benutzer-ID des Schlüssels</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>diese Adresse ist eine sekundäre Benutzer-ID des Schlüssels</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>dieser Schlüssel kann nicht zum Verschlüsseln verwendet werden</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Was auffällt</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Diese Nachricht ist weder signiert noch verschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Diese Nachricht enthält eine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Diese Nachricht ist verschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Diese Nachricht ist verschlüsselt und enthält eine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Diese Nachricht gibt an, OpenPGP zu verwenden, aber ihre Struktur entspricht nicht RFC 3156.</translation>
+        <translation type="vanished">Diese Nachricht gibt an, OpenPGP zu verwenden, aber ihre Struktur entspricht nicht RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2395,7 +2515,7 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
         <translation>Kopie im Gesendet-Ordner</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 Port %2 · %3</translation>
     </message>
@@ -2416,189 +2536,189 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
         <translation>Details kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Diese Adressen werden nur dem ausgehenden Server übermittelt. Sie erscheinen nicht in der Nachricht, sodass kein anderer Empfänger sie sehen kann.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>Es ist kein ausgehendes Konto konfiguriert.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>Für dieses Konto ist kein Passwort gespeichert, daher kann über dieses Konto nichts gesendet werden. Legen Sie das Passwort in den Einstellungen unter E-Mail-Konten fest und aktivieren Sie die Option, es zu speichern.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Wird gesendet. Dieses Fenster zeigt an, was passiert ist.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>Dieses Konto ist nur zum Senden eingerichtet, daher gibt es kein Postfach, um eine Kopie darin aufzubewahren.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>Eine Kopie wurde in %1 abgelegt, aber sie kann danach nicht nachgeschlagen werden: Diese Nachricht trägt keine Message-ID. Eine Nachricht, die exakt so gesendet wird, wie sie angekommen ist, erhält nie eine, da das Hinzufügen Bytes verändern würde, die eine Signatur abdecken könnte.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>Für dieses Konto konnte kein Ordner „Gesendet“ identifiziert werden.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>Die Kopie konnte nicht in das Postfach geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>Die Kopie konnte nicht in das Postfach geschrieben werden: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Wird gestoppt...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Wird noch gesendet</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Diese Nachricht wird noch gesendet.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>Der Server hat die Nachricht möglicherweise bereits angenommen. Wenn Sie dieses Fenster jetzt schließen, erfahren Sie nicht, ob sie zugestellt wurde, und ein erneutes Senden könnte sie doppelt zustellen.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Weiter warten</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Trotzdem schließen</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Noch nicht gesendet</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Senden...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Unbekannt. Die Verbindung wurde nach dem Senden der Nachricht unterbrochen, daher kann der Server die Nachricht angenommen haben oder auch nicht. Prüfen Sie den Ordner „Gesendet“ oder den Empfänger, bevor Sie erneut senden: Erneutes Senden könnte die Nachricht doppelt zustellen.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Ja, vom ausgehenden Mailserver angenommen</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>Nicht gespeichert</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Kopie wird im Ordner „Gesendet“ gespeichert...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>Es wurde keine Kopie gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>Die Nachricht wurde gesendet, aber %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>Für dieses Konto ist kein Passwort gespeichert, daher konnte das Postfach nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>Das Postfach konnte nicht erreicht werden.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>Das Postfach konnte nicht erreicht werden: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Wartet, bis die Nachricht gesendet ist.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Ja, Ihr Mailserver hatte es bereits in %1 abgelegt.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Ja, in %1 gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Abgebrochen: Es wurde keine Kopie aufbewahrt. Die Nachricht wurde trotzdem gesendet.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>Es ist nicht bekannt, ob die Nachricht gesendet wurde.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>An den ausgehenden Mailserver übergeben.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>Nicht gesendet.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Schließen (%1)</translation>
     </message>
@@ -2669,8 +2789,12 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
+        <source>Could not write %1.</source>
+        <translation>%1 konnte nicht geschrieben werden.</translation>
+    </message>
+    <message>
         <source>Cannot write %1.</source>
-        <translation>%1 kann nicht geschrieben werden.</translation>
+        <translation type="vanished">%1 kann nicht geschrieben werden.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
@@ -2750,36 +2874,245 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
         <source>That message is too large to open</source>
         <translation>Diese Nachricht ist zu groß zum Öffnen.</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>Das Zertifikat des Servers ist für einen anderen Host bestimmt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>Das vom Server vorgelegte Zertifikat benennt nicht den von Ihnen konfigurierten Host. So sieht ein Abfangen aus, daher wurde die Verbindung abgelehnt. Prüfen Sie den Hostnamen auf Tippfehler.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>Das Zertifikat des Servers ist derzeit nicht gültig.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>Das Zertifikat ist abgelaufen oder noch nicht gültig. Wenn die Uhr Ihres Computers falsch ist, korrigieren Sie das zuerst; andernfalls muss das Serverzertifikat erneuert werden. Dies kann nicht umgangen werden, indem man dem Zertifikat vertraut.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>Dem Zertifikat des Servers wird nicht vertraut.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>Das Zertifikat wurde nicht von einer Autorität ausgestellt, der Ihr System vertraut. Das ist bei einem selbst gehosteten Server mit eigenem Zertifikat zu erwarten. Sie können es prüfen und entscheiden, ob genau diesem Zertifikat für dieses Konto vertraut werden soll.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>Das Zertifikat des Servers konnte nicht gelesen werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>Das Zertifikat ist von einem Typ, den diese Anwendung nicht verifizieren kann, daher wurde die Verbindung abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>Das Zertifikat des Servers wurde abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>Das Zertifikat konnte nicht verifiziert werden, daher wurde die Verbindung abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>Der Server hat die Absenderadresse abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>Der Postausgangsserver akzeptierte keine E-Mail von dieser Adresse. Das bedeutet in der Regel, dass die Adresse nicht zu dem Konto passt, mit dem Sie angemeldet sind.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>Der Server hat einen Empfänger abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>Der Server hat den Empfänger %1 abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>Die Nachricht wurde an niemanden gesendet. Der Server hat diesen Empfänger abgelehnt, und der Versand wird bei der ersten Ablehnung gestoppt. Bitte korrigieren oder entfernen Sie die Adresse und senden Sie erneut.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>Der Server hat die Nachricht abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>Der ausgehende Server hat den Absender und die Empfänger akzeptiert, aber die Nachricht selbst abgelehnt. Die Antwort wird unten angezeigt und erklärt normalerweise, warum, oft wegen einer Größenbeschränkung oder einer Inhaltsrichtlinie.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>Der Server hat den Aufbau einer verschlüsselten Verbindung abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>Die Verbindung wurde geschlossen, anstatt unverschlüsselt fortgesetzt zu werden. Prüfen Sie, ob dieser Server eine andere Sicherheitseinstellung oder einen anderen Port erwartet.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>Die Anmeldung wurde abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>Der Server hat den Benutzernamen und das Passwort nicht akzeptiert.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>Der Ordner konnte nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>Die Suche konnte nicht abgeschlossen werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>Die Nachricht konnte nicht abgerufen werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>Der Server hat einen Befehl abgelehnt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>Das Ergebnis ist unbekannt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Angehalten.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>Der Server antwortet nicht mehr.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>Der Server hat den Benutzernamen und das Passwort nicht akzeptiert. Wenn dieses Konto zu einem Anbieter gehört, der eine Anmeldung über seine eigene Webseite verlangt, funktioniert ein normales Passwort nicht und Sie benötigen stattdessen ein anwendungsspezifisches Passwort.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>Die Nachricht ist zu groß für diesen Server.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>Der Server hat eine unerwartete Antwort gesendet.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>Der Server konnte nicht gefunden werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>Der Hostname konnte nicht aufgelöst werden. Prüfen Sie ihn auf Tippfehler und stellen Sie sicher, dass dieser Computer online ist.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>Der Server konnte nicht erreicht werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>Der Host wurde aufgelöst, hat die Verbindung jedoch abgelehnt oder ignoriert. Prüfen Sie die Port- und Sicherheitseinstellungen und ob eine Firewall im Weg ist.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>Die verschlüsselte Verbindung konnte nicht aufgebaut werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>Der Server und diese Anwendung konnten sich nicht darüber einigen, wie die Verbindung gesichert werden soll. Ein Server, der nur veraltete Verschlüsselung anbietet, wird hier absichtlich scheitern.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>Der Vorgang ist fehlgeschlagen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>Mit %1 konnte keine verschlüsselte Verbindung aufgebaut werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>Die Verbindung wurde geschlossen, statt unverschlüsselt fortgeführt zu werden, sodass Ihr Passwort niemals gesendet wurde. Prüfen Sie, ob dieser Server eine andere Sicherheitseinstellung oder einen anderen Port erwartet.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>In dieser Anwendung ist etwas schiefgelaufen.</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>E-Mail-Editor</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Neuen Texteditor für E-Mail öffnen.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>IMAP-Controller öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>IMAP-Controller-Dialog öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>Kein E-Mail-Konto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Konfigurieren Sie zuerst ein E-Mail-Konto mit aktiviertem IMAP in den Einstellungen.</translation>
     </message>
@@ -2787,172 +3120,188 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>Signierter Teil nicht mehr in kanonischer Form</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>Der signierte Teil enthält Zeilenumbrüche, die nicht CRLF sind, also nicht die Form, über die eine Signatur berechnet wird. Etwas hat diese Nachricht nach dem Signieren umgeschrieben, normalerweise ein Programm, das Zeilenumbrüche beim Speichern oder Kopieren geändert hat, und nicht ein Angriff. Die Signatur kann gegen diese Bytes nicht verifiziert werden, und das Importieren des Schlüssels des Absenders wird das nicht ändern. Zur Prüfung wird die ursprüngliche, unveränderte Nachricht benötigt.</translation>
+        <translation type="vanished">Der signierte Teil enthält Zeilenumbrüche, die nicht CRLF sind, also nicht die Form, über die eine Signatur berechnet wird. Etwas hat diese Nachricht nach dem Signieren umgeschrieben, normalerweise ein Programm, das Zeilenumbrüche beim Speichern oder Kopieren geändert hat, und nicht ein Angriff. Die Signatur kann gegen diese Bytes nicht verifiziert werden, und das Importieren des Schlüssels des Absenders wird das nicht ändern. Zur Prüfung wird die ursprüngliche, unveränderte Nachricht benötigt.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>Doppelter %1-Header</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Diese Nachricht enthält %1 Kopien eines Headers, der nur einmal vorkommen darf. Verschiedene Mailprogramme wählen unterschiedliche Kopien aus, daher ist das, was Sie hier sehen, möglicherweise nicht das, was ein anderer Leser sieht.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>Adresse möglicherweise verschleiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>Die Domain in &quot;%1&quot; verwendet Zeichen, die so dargestellt werden können, dass sie wie eine andere, vertraute Adresse aussehen.</translation>
+        <translation type="vanished">Die Domain in &quot;%1&quot; verwendet Zeichen, die so dargestellt werden können, dass sie wie eine andere, vertraute Adresse aussehen.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Antworten gehen woandershin</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Diese Nachricht stammt von &quot;%1&quot;, aber Antworten würden an &quot;%2&quot; gesendet, was eine andere Domain ist.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>Der signierte Teil enthält Zeilenenden, die nicht CRLF sind. Das ist nicht die Form, über der die Signatur berechnet wurde. Etwas hat diese Nachricht nach dem Signieren umgeschrieben, normalerweise ein Programm, das beim Speichern oder Kopieren die Zeilenenden geändert hat, und nicht ein Angriff. Die Signatur kann gegen diese Bytes nicht verifiziert werden, und das Importieren des Schlüssels des Absenders wird daran nichts ändern. Zum Prüfen wird die ursprüngliche, unveränderte Nachricht benötigt.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>Die Domain in &quot;%1&quot; verwendet Zeichen, die so dargestellt werden können, dass sie wie eine andere, vertraute Adresse aussehen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Diese Nachricht stammt von &quot;%1&quot;, aber Antworten würden an &quot;%2&quot; gesendet, was eine andere Domain ist.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Fehlerhafter signierter Abschnitt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Ein signierter Abschnitt muss genau zwei Teile enthalten; dieser enthält %1. Er lässt sich möglicherweise nicht verifizieren, und was er abdeckt, ist mehrdeutig.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Fehlerhafter verschlüsselter Abschnitt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Ein verschlüsselter Abschnitt muss genau zwei Teile enthalten; dieser enthält %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>Nicht alles ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>%1 Teil(e) dieser Nachricht befinden sich außerhalb der Signatur. Sie sind unauthentifiziert angekommen und könnten von jedem auf dem Übertragungsweg hinzugefügt oder verändert worden sein.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>Die Signatur umfasst nur die verschlüsselten Daten.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Diese Signatur wurde über den verschlüsselten Block erstellt, nicht über die darin enthaltene Nachricht. Sie zeigt, wer den Chiffretext weitergeleitet hat; sie sagt nicht, wer das geschrieben hat, was Sie lesen, und jeder hätte eine Kopie desselben Blocks signieren können.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Öffentlicher Schlüssel angehängt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Diese Nachricht enthält %1 öffentliche(n) OpenPGP-Schlüssel. Ein Schlüssel, der in einer Nachricht ankommt, beweist nichts über den Absender: Jeder kann einen beliebigen Schlüssel anhängen, auch einen, den er für den Namen in der Absenderzeile erstellt hat.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Abgetrennte Signatur angehängt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Diese Nachricht enthält %1 Signaturdatei(en), die nicht Teil ihrer eigenen signierten Struktur sind. Beim Öffnen der Nachricht werden sie nicht geprüft; sie signieren etwas anderes.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>Blindkopie-Empfänger sind sichtbar</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Diese Nachricht enthält einen Bcc-Kopf, der %1 Empfänger nennt. Jeder, der sie erhalten hat, kann sehen, wer blindkopiert wurde.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Nichts ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Diese Nachricht enthält keine Signatur, daher kann der Empfänger nicht erkennen, dass sie von Ihnen stammt oder dass sie unverändert angekommen ist.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Einige Teile sind nicht signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>%1 Teil(e) dieser Nachricht würden versendet, ohne von der Signatur abgedeckt zu sein.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Blindkopie-Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>%1 Blindkopie-Empfänger werden in die Verschlüsselung einbezogen, erscheinen aber nirgendwo in der Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>Bcc-Kopfzeile vorhanden</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Diese Nachricht enthält eine Bcc-Kopfzeile. Beim Senden erführe jeder Empfänger, wer blindkopiert wurde.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>Empfänger ist möglicherweise verschleiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>Die Domain in &quot;%1&quot; verwendet Zeichen, die so dargestellt werden können, dass sie wie eine andere Adresse aussehen. Überprüfen Sie es vor dem Senden.</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>Die Domain in „%1“ verwendet Zeichen, die wie eine andere Adresse aussehen können. Prüfen Sie sie vor dem Senden.</translation>
+        <translation type="vanished">Die Domain in „%1“ verwendet Zeichen, die wie eine andere Adresse aussehen können. Prüfen Sie sie vor dem Senden.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Keine Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Diese Nachricht ist an niemanden adressiert.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.en_US.ts b/src/m_email/ts/ModuleEMail.en_US.ts
index b78f43b..c846fdd 100644
--- a/src/m_email/ts/ModuleEMail.en_US.ts
+++ b/src/m_email/ts/ModuleEMail.en_US.ts
@@ -218,7 +218,7 @@ Its stored password is forgotten as well. This cannot be undone once you press O
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
-        <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -509,11 +509,6 @@ Use Refresh to try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
-        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
@@ -545,8 +540,13 @@ Use Refresh to try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../EMailImapController.cpp" line="961"/>
-        <source>This message is larger than this application will open, so it cannot be imported.</source>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -669,7 +669,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -687,7 +687,7 @@ After correcting the EML data, try the operation again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -711,271 +711,320 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
-        <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
-        <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
-        <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -984,782 +1033,792 @@ If the issue persists, consider seeking technical support or consulting the docu
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
-        <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
-        <source>Cannot send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
-        <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1768,47 +1827,47 @@ This message came from somewhere else, so unless these have been saved already t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1857,11 +1916,6 @@ This message came from somewhere else, so unless these have been saved already t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
-        <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
         <translation type="unfinished"></translation>
@@ -1938,235 +1992,245 @@ This message came from somewhere else, so unless these have been saved already t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
-        <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
-        <source>encrypted to, but not in the visible headers</source>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
-        <source>Hidden recipient</source>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="490"/>
-        <source>the sender chose not to record who this is</source>
+        <source>encrypted to, but not in the visible headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="250"/>
-        <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
-        <source>Fingerprint</source>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
+        <source>Hidden recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
-        <source>in %1, but not encrypted to it: they cannot read this</source>
+        <location filename="../EMailSecurityView.cpp" line="250"/>
+        <location filename="../EMailSecurityView.cpp" line="253"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <source>Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
-        <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>EMailSendDialog</name>
@@ -2244,7 +2308,7 @@ This message came from somewhere else, so unless these have been saved already t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2265,189 +2329,189 @@ This message came from somewhere else, so unless these have been saved already t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2518,7 +2582,7 @@ This message came from somewhere else, so unless these have been saved already t
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
-        <source>Cannot write %1.</source>
+        <source>Could not write %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2599,36 +2663,245 @@ This message came from somewhere else, so unless these have been saved already t
         <source>That message is too large to open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2636,172 +2909,172 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
-        <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
-        <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
+        <location filename="../EMailHelper.cpp" line="1887"/>
+        <source>Replies go somewhere else</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
-        <source>Replies go somewhere else</source>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
-        <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
-        <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.es_ES.ts b/src/m_email/ts/ModuleEMail.es_ES.ts
index 259e28d..b0a92a8 100644
--- a/src/m_email/ts/ModuleEMail.es_ES.ts
+++ b/src/m_email/ts/ModuleEMail.es_ES.ts
@@ -224,8 +224,12 @@ Su contraseña almacenada también se olvidará. Esto no se puede deshacer una v
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Otra cuenta ya usa esta dirección. No se pueden distinguir dondequiera que se ofrezcan cuentas.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Otra cuenta ya usa esta dirección. No se pueden distinguir donde se ofrecen las cuentas.</translation>
+        <translation type="vanished">Otra cuenta ya usa esta dirección. No se pueden distinguir donde se ofrecen las cuentas.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Use Actualizar para intentarlo de nuevo.</translation>
         <translation>Seleccione una cuenta para abrir.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>No hay ninguna contraseña almacenada para esta cuenta. Establezca una en Configuración, en Cuentas de correo, y luego use Reintentar.</translation>
+        <translation type="vanished">No hay ninguna contraseña almacenada para esta cuenta. Establezca una en Configuración, en Cuentas de correo, y luego use Reintentar.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Use Actualizar para intentarlo de nuevo.</translation>
         <translation>Fecha no indicada</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>Este mensaje es más grande de lo que esta aplicación puede abrir, por lo que no se puede importar.</translation>
+        <translation type="vanished">Este mensaje es más grande de lo que esta aplicación puede abrir, por lo que no se puede importar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>No se almacena ninguna contraseña para esta cuenta. Establezca una en Configuración, en Cuentas de correo, y luego use Actualizar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>Este mensaje es demasiado grande para que esta aplicación lo abra, por lo que no se puede importar.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Use Actualizar para intentarlo de nuevo.</translation>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML es un formato de archivo para representar mensajes de correo electrónico, q
 Después de corregir los datos EML, intente realizar la operación nuevamente.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ Se produjo un error durante la operación de correo electrónico. No se pudo com
 Si el problema persiste, considere buscar soporte técnico o consultar la documentación.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>Correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ Si el problema persiste, considere buscar soporte técnico o consultar la docume
         <translation type="vanished">Algoritmo de verificación de integridad del mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Resumen de la entidad MIME firmada (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Hash de firma declarado (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Destinatario de cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>ID de clave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>cifrado para</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>cifrado para, no en las cabeceras</translation>
+        <translation type="vanished">cifrado para, no en las cabeceras</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Destinatario oculto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>el remitente ocultó este ID de clave</translation>
+        <translation type="vanished">el remitente ocultó este ID de clave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Verificación de destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>DETALLES</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Descifrar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>DESTINATARIO</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Firmar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Verificar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>FIRMANTE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Comprobar antes de exportar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>Hay algo en este mensaje que conviene comprobar antes de guardarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>Los bytes que cubre la firma fueron reescritos después de que se hiciera: sus finales de línea ya no son CRLF. Esto suele deberse a un programa que los cambió al guardar o copiar el mensaje. Para comprobar la firma se necesitan los bytes originales.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>La firma es válida y la clave que la creó responde por la dirección de la que este mensaje dice provenir.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>La firma en sí es válida, pero la clave que la creó no responde por la dirección de la que este mensaje dice provenir. Así es como se ve una firma trasladada de otro mensaje, por lo que conviene comprobar quién es el firmante antes de confiar en el contenido.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>La clave que creó esta firma no está en su anillo de claves, por lo que nada aquí puede decir si la firma es auténtica. Importe la clave del remitente y verifique de nuevo.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>La firma se creó con una clave que ha expirado, o la propia firma ha expirado. Puede que siga siendo auténtica; lo que no se puede confirmar es que la clave fuera válida en el momento en que se usó.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>La firma no coincide con los bytes que cubre. O el mensaje se modificó después de firmarse, o la firma no se creó para este mensaje.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>No se pudo completar la comprobación, por lo que no se sabe nada sobre esta firma en un sentido u otro. Esto no es una afirmación de que la firma sea mala.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Este mensaje afirma contener una firma OpenPGP, pero su estructura no es lo bastante sólida como para comprobarla.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Las firmas de este mensaje cubren los datos cifrados, no el contenido que usted lee. Confirman quién cifró el mensaje, pero no dicen nada sobre quién escribió lo que hay dentro.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>No había ninguna firma en este mensaje que comprobar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Nota**: la parte firmada no está en forma canónica, porque sus saltos de línea no son CRLF. Algo reescribió este mensaje después de que fuera firmado, normalmente un programa que cambió los saltos de línea al guardarlo o copiarlo. Una firma no puede verificarse contra estos bytes, e importar la clave del remitente no cambiará eso.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>Verificar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, una clave OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, no cubierta por la firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>en %1, pero no cifrado para ella: no se puede leer</translation>
+        <translation type="vanished">en %1, pero no cifrado para ella: no se puede leer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>Descifrar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>Firmar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>Cifrar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Cifrar y firmar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Este mensaje no está firmado, por lo que no hay ninguna firma que comprobar. Se descifró correctamente.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>El contenido descifrado no es un mensaje MIME, por lo que no hay ninguna firma que comprobar. Se descifró correctamente.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Este mensaje se descifró. No lleva ninguna firma, por lo que nada aquí indica quién lo envió.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Descifrar y verificar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Guardar archivo</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Mensaje de correo electrónico (*.eml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>en %1, pero no cifrado para ella: no pueden leer este mensaje</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>cifrado para, pero no incluido en las cabeceras</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>el remitente ocultó este ID de clave</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>No se puede escribir el archivo %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 no es un archivo ordinario, por lo que no se puede abrir como mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>El archivo %1 es demasiado grande (%2) para abrirse. El tamaño máximo permitido es %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ Si el problema persiste, considere buscar soporte técnico o consultar la docume
         <translation type="vanished">El archivo %1 es demasiado grande (%2 bytes) para abrirse. El tamaño máximo permitido es 1 MB.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>No se puede leer el archivo %1:
@@ -1116,359 +1189,373 @@ Si el problema persiste, considere buscar soporte técnico o consultar la docume
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>separe varias direcciones con &quot;;&quot;</translation>
+        <translation type="vanished">separe varias direcciones con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Cco</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>Para:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>Cco:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Enviar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Enviar este mensaje a través de una cuenta de correo configurada.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Escriba su mensaje aquí.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Añada uno o más archivos a este mensaje. Los archivos también se pueden soltar en el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Quitar los archivos adjuntos seleccionados de este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Guardar los adjuntos seleccionados en una carpeta.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Guardar cada adjunto en una carpeta.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Este mensaje está cifrado. Descífrelo antes de editarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Este mensaje está cifrado y firmado. Descífrelo y, a continuación, elimine la firma antes de editar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Fuente sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Separe varias direcciones con &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Mensaje protegido</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Estos bytes están cubiertos por una firma, o son texto cifrado. Elimine la firma o descifre el mensaje, antes de editar su fuente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Dejar de editar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Editar fuente sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Está editando la fuente sin procesar del mensaje. Lo que escribe aquí es el documeto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Este mensaje está bloquedo para inspección. Su fuete no se puede editar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Solo lectura. Desbloquee para editar la fuete del mensaje directmente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Este mensaje está cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Descifrar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Este mensaje está cifrado y firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Los destinatarios no se mencionan en las cabeceras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Dirigido a %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>Los destinatarios no se mencionan, por lo que no hay manera de saber si puede abrir esto hasta que lo intente.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>adjuntar una clave pública</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>añadir texto a este mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Mensaje bloqueado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Este mensaje está abierto solo para inspección, por lo que no es posible %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Mensaje cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Descifre este mensaje antes de intentar %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Mensaje firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>Este es un borrador que aún estás escribiendo, no un mensaje recibido, así que no hay nada sobre lo que actuar todavía.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Este mensaje no se puede editar de todos modos: está firmado o cifrado, por lo que ya está protegido contra reescrituras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Aún no hay ninguna cuenta de correo configurada. Añade una en Configuración, en Cuentas de correo, y este mensaje podrá enviarse.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Indica quién envía este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>La dirección del remitente no parece una dirección de correo electrónico.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Añade al menos un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Pon un asunto a este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Esto no parece una dirección de correo electrónico: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>No se pudo comprobar la firma</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Estructura OpenPGP malformada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>No firmado ni cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Este mensaje está bloqueado para inspección.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Cifrar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Cifrar y firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Verificar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Detalles de la firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Volver a firmar con otra clave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Eliminar firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Descifrar y verificar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Detalles del cifrado...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Detalles...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Descifre este mensaje primero.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>¿Qué le pasa a este mensaje?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Intentar verificar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Intentar descifrar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Firma inaccesible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La firma está dentro de la parte cifrada de este mensaje. Descifre primero el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Nada que quitar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Este mensaje no lleva ninguna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>No se puede quitar la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Este mensaje no sigue el RFC 3156 lo bastante fielmente como para quitarle la firma de forma segura. Edite la fuente original en su lugar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Quitar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La firma se descarta y el mensaje se convierte en uno normal sin firmar. El mensaje en sí se conserva exactamente como está. Esta acción no se puede deshacer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>sin firmar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>No se puede enviar</translation>
+        <translation type="vanished">No se puede enviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Este mensaje necesita un remitente y al menos un destinatario antes de poder enviarse.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Estructura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Detalles del mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>Cabeceras</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Los destinatarios ocultos nunca se escriben en el mensaje: una cabecera Cco revelaría a todos los destinatarios quién recibió una copia oculta. Se utilizan para elegir los destinatarios del cifrado y no se guardan con el archivo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Mostrar Cc y Cco (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Mostrar el mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Mostrar el documento sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Redactar una respuesta al remitente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Responder a todos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Redactar una respuesta al remitente y a todos los demás destinatarios. No se incluye a los destinatarios ocultos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Reenviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Reenviar este mensaje con sus adjuntos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Solo lectura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Bloquear este mensaje para que no se pueda editar ni reescribir. Responder y Reenviar siguen funcionando y generan mensajes nuevos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Mostrar lo que se sabe sobre este mensaje: sus firmas, su estructura y sus cabeceras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Adjuntar archivo...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Guardar todo...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Este mensaje está abierto solo para inspección. No se puede editar ni reescribir; Responder y Reenviar siguen funcionando y generan mensajes nuevos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Este mensaje está firmado. Elimine la firma antes de editarlo. Una edición bajo una firma se considera una falsificación.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Este mensaje fue escrito en HTML. Se muestra como su código fuente en lugar de renderizado: nada aquí carga imágenes ni sigue enlaces.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Solo lectura. Estos bytes están protegidos. Elimine la firma o descifre el mensaje para editarlos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Este mensaje no se pudo ensamblar para su inspección, por lo que no hay nada que mostrar aquí. El mensaje en sí no ha cambiado.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>No se puede responder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>No se puede responder a todos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>No se puede reenviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Este mensaje en sí no ha sido modificado.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>No se puede abrir un mensaje nuevo desde aquí, porque esta vista no está dentro de una ventana que tenga pestañas.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>No se pudo ensamblar el mensaje nuevo. Esto normalemente signiffica que una parte del original no se pudo volver a codifcar, casi siempre un adjunto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>No se pudo abrir una pestaña para el mensaje nuevo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>La pestaña nueva se abrió, pero no muestra una vista de mensaje, por lo que no hay dónde poner la respuesta. La pestaña se puede cerrar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>Los destinatarios no se indican, por lo que no se puede saber si puede abrirlo hasta que lo intente.</translation>
+        <translation type="vanished">Los destinatarios no se indican, por lo que no se puede saber si puede abrirlo hasta que lo intente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>No tiene una clave privada para ninguna de estas direcciones. A menos que el mensaje también se haya cifrado para una clave que no se menciona aquí, no se puede abrir en este equipo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>Tiene la clave privada de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>Tiene claves privadas para %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 ¿Quitar la firma y convertirlo en un mensaje normal?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Cifrado, firma no comprobada.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Firma no comprobada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Cifrado, firma verificada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Firma verificada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Firmado por una dirección diferente</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Firma o clave expirada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Firmado por una clave desconocida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Firma incorrecta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>firmado, no comprobado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>firmado, no se pudo comprobar</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>firma no válida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Algunas partes están fuera de la sección firmada de este mensaje. No están cubiertas por la firma y cualquiera podría haberlas añadido.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Mensaje de correo electrónico (*.eml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>No se puede enviar</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Adjuntar archivos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 es una carpeta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 no es un archivo normal</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 es demasiado grande (%2); el máximo que se puede adjuntar es %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Importar clave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Copiar nombre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Abrir archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Guárdelo en su lugar y ábralo usted mismo si está seguro de su procedencia.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>No se pudo crear una carpeta temporal desde la que abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>No se pudo escribir %1 para abrirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nada en este sistema está registrado para abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Quitar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la única copia. Quitarlos no se puede deshacer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>Se guardó 1 archivo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>Se guardaron %1 archivos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Guardar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>No se puede escribir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Guardar adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>No se pudo escribir: %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
         <translation>Válida, con problemas</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>Válida, clave no totalmente confiable</translation>
+        <translation type="vanished">Válida, clave no totalmente confiable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
         <translation>Importar la clave de este mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Verificar firmas</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Verificar de nuevo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Firmas</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Firma %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>cubre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>cubre %1, anidado %2 niveles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Resultado</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>esta sección está firmada, pero nada la ha verificado todavía</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>esta sección está firmada, pero verificarla no produjo ningún resultado: la clave de firma puede no estar en su anillo de claves</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Firmante desconocido</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Dirección diferente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>la firma es válida, pero la clave pertenece a %1 mientras que este mensaje dice que es de %2. Una firma válida indica quién firmó los bytes, no quién envió el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Algoritmo de clave pública</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Firmado el</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Hash declarado (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Hash de la firma</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>El hash no coincide</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>el mensaje declara %1 pero la firma usó %2</translation>
+        <translation type="vanished">el mensaje declara %1 pero la firma usó %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Destinatarios</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>dirigido y cifrado a</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>el remitente optó por no registrar quién es este destinatario</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Este mensaje afirma usar OpenPGP, pero su estructura no sigue el RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>No hay nada más que informar sobre este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Clave %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>válida, pero la clave no es totalmente confiable</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>el mensaje declara %1, pero la firma utilizó %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>en %1, pero no está cifrado para ella: no pueden leer este mensaje</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>cifrado para, pero no en los encabezados visibles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Destinatario oculto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>el remitente optó por no indicar quién es</translation>
+        <translation type="vanished">el remitente optó por no indicar quién es</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Huella</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>en %1, pero no está cifrado para ella: no pueden leer esto</translation>
+        <translation type="vanished">en %1, pero no está cifrado para ella: no pueden leer esto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>el motor informó de la clave primaria en lugar de la subclave de cifrado realmente utilizada</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Claves para estas direcciones</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>no se encontró ninguna clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 claves</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>la clave es %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Identidad</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>esta dirección está en un ID de usuario REVOCADO de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>esta dirección es el ID de usuario principal de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>esta dirección es un ID de usuario secundario de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>esta clave no se puede usar para cifrar</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Lo que destaca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Este mensaje no está firmado ni cifrado.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Este mensaje contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Este mensaje está cifrado.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Este mensaje está cifrado y contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Este mensaje afirma usar OpenPGP, pero su estructura no sigue el RFC 3156.</translation>
+        <translation type="vanished">Este mensaje afirma usar OpenPGP, pero su estructura no sigue el RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2395,7 +2515,7 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
         <translation>Copia en Enviados</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 puerto %2 · %3</translation>
     </message>
@@ -2416,189 +2536,189 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
         <translation>Copiar detalles</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Estas direcciones se proporcionan únicamente al servidor de salida. No aparecen en el mensaje, por lo que ningún otro destinatario puede verlas.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>No hay ninguna cuenta de salida configurada.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>No se ha guardado ninguna contraseña para esta cuenta, por lo que no se puede enviar nada a través de ella. Establece la contraseña en Configuración, en Cuentas de correo, y activa la opción para recordarla.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Enviando. Esta ventana indicará lo que ha sucedido.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>Esta cuenta está configurada solo para envío, por lo que no hay buzón donde guardar una copia.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>Se guardó una copia en %1, pero no se puede consultar después: este mensaje no lleva Message-ID. Un mensaje enviado exactamente como llegó nunca recibe uno, porque añadirlo cambiaría bytes que una firma podría cubrir.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>No se pudo identificar una carpeta de Enviados para esta cuenta.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>No se pudo escribir la copia en el buzón.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>No se pudo escribir la copia en el buzón: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Deteniendo...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Aún enviando</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Este mensaje aún se está enviando.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>El servidor puede que ya lo haya aceptado. Si cierra esta ventana ahora, no sabrá si se entregó, y enviarlo de nuevo podría entregarlo dos veces.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Seguir esperando</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Cerrar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Aún no enviado</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Enviando...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Desconocido. La conexión se perdió después de que el mensaje se enviara, por lo que el servidor puede haberlo aceptado o no. Compruebe la carpeta de enviados o el destinatario antes de volver a enviarlo: reenviarlo podría entregarlo dos veces.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Sí, aceptado por el servidor de correo saliente</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>No guardado</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Guardando una copia en Enviados...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>No se guardó ninguna copia.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>El mensaje se envió, pero %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>No hay ninguna contraseña almacenada para esta cuenta, por lo que no se pudo abrir su buzón.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>No se pudo acceder al buzón.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>No se pudo acceder al buzón: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Espera hasta que el mensaje se envíe</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Sí, su servidor de correo ya lo había archivado en %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Sí, guardado en %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Detenido: no se guardó ninguna copia. El mensaje se envió de todos modos.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>No se sabe si se envió.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>Entregado al servidor de correo saliente.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>No enviado.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Cerrar (%1)</translation>
     </message>
@@ -2669,8 +2789,12 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
+        <source>Could not write %1.</source>
+        <translation>No se pudo escribir %1.</translation>
+    </message>
+    <message>
         <source>Cannot write %1.</source>
-        <translation>No se puede escribir %1.</translation>
+        <translation type="vanished">No se puede escribir %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
@@ -2750,36 +2874,245 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
         <source>That message is too large to open</source>
         <translation>Ese mensaje es demasiado grande para abrirlo</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>El certificado del servidor es para un host distinto</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>El certificado presentado por el servidor no menciona el host que configuró. Esto es lo que parece una interceptación, por lo que se rechazó la conexión. Compruebe si hay un error tipográfico en el nombre del host.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>El certificado del servidor no es válido actualmente</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>El certificado ha expirado o aún no es válido. Si el reloj de su computadora está mal, corríjalo primero; de lo contrario, el certificado del servidor debe renovarse. Esto no se puede evitar confiando en el certificado.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>El certificado del servidor no es de confianza</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>El certificado no fue emitido por una autoridad en la que su sistema confía. Eso es de esperar para un servidor autohospedado con su propio certificado. Puede examinarlo y elegir confiar en este mismo certificado para esta cuenta.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>El certificado del servidor no se pudo leer</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>El certificado es de un tipo que esta aplicación no puede verificar, por lo que se rechazó la conexión.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>El certificado del servidor fue rechazado</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>El certificado no se pudo verificar, por lo que se rechazó la conexión.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>El servidor rechazó la dirección del remitente</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>El servidor de salida no aceptó el correo de esta dirección. Por lo general, significa que la dirección no coincide con la cuenta con la que inició sesión.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>El servidor rechazó a un destinatario</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>El servidor rechazó al destinatario %1</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>El mensaje no se envió a nadie. El servidor rechazó a este destinatario y el envío se detiene ante el primer rechazo. Corrija o elimine la dirección y vuelva a enviar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>El servidor rechazó el mensaje</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>El servidor de salida aceptó al remitente y a los destinatarios, pero rechazó el mensaje en sí. Su respuesta se muestra a continuación y suele explicar el motivo, a menudo por un límite de tamaño o una política de contenido.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>El servidor se negó a iniciar una conexión cifrada</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>La conexión se cerró en lugar de continuar sin cifrar. Compruebe si este servidor espera una configuración de seguridad o un puerto diferente.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>Se rechazó el inicio de sesión</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>El servidor no aceptó el nombre de usuario y la contraseña.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>No se pudo abrir la carpeta</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>No se pudo completar la búsqueda</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>No se pudo recuperar el mensaje</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>El servidor rechazó un comando.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>El resultado es desconocido.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Detenido</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>El servidor dejó de responder.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>El servidor no aceptó el nombre de usuario y la contraseña. Si esta cuenta pertenece a un proveedor que requiere iniciar sesión a través de su propia página web, una contraseña normal no funcionará y necesitará una contraseña específica de la aplicación en su lugar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>El mensaje es demasiado grande para este servidor.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>El servidor envió una respuesta inesperada.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>No se pudo encontrar el servidor.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>El nombre de host no se resolvió. Revise si hay un error tipográfico y compruebe que este equipo está en línea.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>No se pudo alcanzar el servidor.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>El host se resolvió, pero rechazó o ignoró la conexión. Compruebe el puerto y la configuración de seguridad, y si hay un firewall en el camino.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>No se pudo establecer la conexión cifrada.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>El servidor y esta aplicación no pudieron ponerse de acuerdo sobre cómo asegurar la conexión. Un servidor que solo ofrezca cifrado obsoleto fallará aquí, lo cual es deliberado.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>La operación falló</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 no quiso iniciar una conexión cifrada</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>La conexión se cerró en lugar de continuar sin cifrar, por lo que su contraseña nunca se envió. Compruebe si este servidor espera una configuración de seguridad o un puerto diferente.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>Algo salió mal dentro de esta aplicación</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>Editor de correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Abrir un nuevo editor de texto para correo electrónico.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>Abrir controlador IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>Abrir diálogo del controlador IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>No hay cuenta de correo</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Configura primero una cuenta de correo con IMAP habilitado en Configuración.</translation>
     </message>
@@ -2787,172 +3120,188 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>La parte firmada ya no está en forma canónica</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>La parte firmada contiene finales de línea que no son CRLF, que no es la forma sobre la que se calcula una firma. Algo reescribió este mensaje después de que fuera firmado, normalmente un programa que cambió los finales de línea al guardarlo o copiarlo, más que un ataque. La firma no puede verificarse contra estos bytes, e importar la clave del remitente no cambiará eso. Comprobarlo requiere el mensaje original sin modificar.</translation>
+        <translation type="vanished">La parte firmada contiene finales de línea que no son CRLF, que no es la forma sobre la que se calcula una firma. Algo reescribió este mensaje después de que fuera firmado, normalmente un programa que cambió los finales de línea al guardarlo o copiarlo, más que un ataque. La firma no puede verificarse contra estos bytes, e importar la clave del remitente no cambiará eso. Comprobarlo requiere el mensaje original sin modificar.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>Cabecera %1 duplicada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Este mensaje contiene %1 copias de una cabecera que solo puede aparecer una vez. Diferentes programas de correo eligen copias distintas, por lo que lo que ves aquí puede no ser lo que ve otro lector.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>La dirección puede estar disfrazada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>El dominio en &quot;%1&quot; utiliza caracteres que pueden hacer que parezca una dirección diferente y conocida.</translation>
+        <translation type="vanished">El dominio en &quot;%1&quot; utiliza caracteres que pueden hacer que parezca una dirección diferente y conocida.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Las respuestas van a otra parte</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Este mensaje es de &quot;%1&quot;, pero las respuestas se enviarían a &quot;%2&quot;, que es un dominio diferente.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>La parte firmada contiene finales de línea que no son CRLF, que no es la forma sobre la que se calculó la firma. Algo reescribió este mensaje después de que se firmara, normalmente un programa que cambió los finales de línea al guardarlo o copiarlo, no un ataque. La firma no puede verificarse con estos bytes, e importar la clave del remitente no cambiará eso. Para comprobarla se necesita el mensaje original sin modificar.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>El dominio en &quot;%1&quot; utiliza caracteres que pueden hacer que parezca una dirección diferente y conocida.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Este mensaje es de &quot;%1&quot;, pero las respuestas se enviarían a &quot;%2&quot;, que es un dominio diferente.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Sección firmada malformada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Una sección firmada debe contener exactamente dos partes; esta contiene %1. Puede que no se verifique, y lo que cubre es ambiguo.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Sección cifrada malformada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Una sección cifrada debe contener exactamente dos partes; esta contiene %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>No todo está firmado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>Hay %1 parte(s) de este mensaje fuera de la firma. No están autenticadas y cualquiera en el trayecto podría haberlas añadido o modificado.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>La firma solo cubre los datos cifrados</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Esta firma se realizó sobre el bloque cifrado, no sobre el mensaje que contiene. Indica quién envió el texto cifrado; no dice quién escribió lo que está leyendo, y cualquiera podría haber firmado una copia de este mismo bloque.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Clave pública adjunta</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Este mensaje contiene %1 clave(s) pública(s) de OpenPGP. Una clave que llega en un mensaje no prueba nada sobre quién la envió: cualquiera puede adjuntar cualquier clave, incluida una que haya creado para el nombre en la línea De.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Firma separada adjunta</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Este mensaje contiene %1 archivo(s) de firma que no forman parte de su propia estructura firmada. Abrir el mensaje no los verifica; firman otra cosa.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>Los destinatarios ocultos son visibles</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Este mensaje contiene una cabecera Cco que menciona a %1 destinatario(s). Cualquiera que lo haya recibido puede ver quién estaba en copia oculta.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Nada está firmado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Este mensaje no contiene ninguna firma, por lo que el destinatario no puede saber que proviene de usted ni que llegó sin cambios.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Algunas partes no están firmadas</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>%1 parte(s) de este mensaje saldrá(n) sin la cobertura de la firma.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Destinatarios ocultos</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>%1 destinatario(s) oculto(s) se incluirá(n) en el cifrado, pero no aparecerá(n) en ningún lugar del mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>Cabecera Bcc presente</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Este mensaje incluye una cabecera Bcc. Enviarlo revelaría a todos los destinatarios quién estaba en copia oculta.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>El destinatario podría estar suplantado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>El dominio en &quot;%1&quot; utiliza caracteres que pueden hacer que parezca una dirección diferente. Compruébalo antes de enviar.</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>El dominio en «%1» usa caracteres que pueden estar diseñados para parecerse a una dirección distinta. Compruébalo antes de enviar.</translation>
+        <translation type="vanished">El dominio en «%1» usa caracteres que pueden estar diseñados para parecerse a una dirección distinta. Compruébalo antes de enviar.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Sin destinatarios</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Este mensaje no está dirigido a nadie.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.fr_FR.ts b/src/m_email/ts/ModuleEMail.fr_FR.ts
index 6bf96dd..8472a4d 100644
--- a/src/m_email/ts/ModuleEMail.fr_FR.ts
+++ b/src/m_email/ts/ModuleEMail.fr_FR.ts
@@ -224,8 +224,12 @@ Son mot de passe enregistré sera également oublié. Cette action ne peut pas �
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Un autre compte utilise déjà cette adresse. Ils ne peuvent pas être distingués où que les comptes soient proposés.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Un autre compte utilise déjà cette adresse. Ils ne peuvent pas être distingués là où les comptes sont proposés.</translation>
+        <translation type="vanished">Un autre compte utilise déjà cette adresse. Ils ne peuvent pas être distingués là où les comptes sont proposés.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Utilisez Actualiser pour réessayer.</translation>
         <translation>Choisissez un compte à ouvrir.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>Aucun mot de passe n&apos;est stocké pour ce compte. Définissez-en un dans les paramètres, sous Comptes de messagerie, puis utilisez Réessayer.</translation>
+        <translation type="vanished">Aucun mot de passe n&apos;est stocké pour ce compte. Définissez-en un dans les paramètres, sous Comptes de messagerie, puis utilisez Réessayer.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,8 +561,17 @@ Utilisez Actualiser pour réessayer.</translation>
         <translation>Date non indiquée</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
+        <translation type="vanished">Ce message est trop volumineux pour être ouvert par cette application ; il ne peut donc pas être importé.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>Aucun mot de passe n&apos;est stocké pour ce compte. Définissez-en un dans Paramètres, sous Comptes de messagerie, puis utilisez Actualiser.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
         <translation>Ce message est trop volumineux pour être ouvert par cette application ; il ne peut donc pas être importé.</translation>
     </message>
     <message>
@@ -749,7 +761,7 @@ Utilisez Actualiser pour réessayer.</translation>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML est un format de fichier pour représenter des messages e-mail, comprenant g
 Après avoir corrigé les données EML, réessayez l&apos;opération.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ Une erreur s&apos;est produite lors de l&apos;opération e-mail. Le processus n&
 Si le problème persiste, envisagez de contacter le support technique ou de consulter la documentation.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>À</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>Cci</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ Si le problème persiste, envisagez de contacter le support technique ou de cons
         <translation type="vanished">Algorithme de contrôle d&apos;intégrité du message</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Empreinte de l&apos;entité MIME signée (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Hachage de signature déclaré (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Destinataire du chiffrement</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Destinataire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>Identifiant de clé</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>chiffré pour</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>chiffré pour, absent des en-têtes</translation>
+        <translation type="vanished">chiffré pour, absent des en-têtes</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Destinataire masqué</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>l&apos;expéditeur a masqué cet identifiant de clé</translation>
+        <translation type="vanished">l&apos;expéditeur a masqué cet identifiant de clé</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Vérification du destinataire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>DÉTAILS</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Déchiffrer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>DESTINATAIRE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Signer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>SIGNATAIRE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Vérifier avant d&apos;exporter</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>Quelque chose dans ce message mérite d&apos;être vérifié avant de l&apos;enregistrer.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>Les octets couverts par la signature ont été réécrits après sa création : leurs fins de ligne ne sont plus en CRLF. Cela provient généralement d&apos;un programme qui les a modifiées lors de l&apos;enregistrement ou de la copie du message. La vérification de la signature nécessite les octets d&apos;origine.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>La signature est valide et la clé qui l&apos;a produite correspond à l&apos;adresse dont ce message prétend provenir.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>La signature elle-même est valide, mais la clé qui l&apos;a produite ne correspond pas à l&apos;adresse dont ce message prétend provenir. C&apos;est ce à quoi ressemble une signature déplacée depuis un autre message, il est donc utile de vérifier qui est le signataire avant de se fier au contenu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>La clé qui a produit cette signature n&apos;est pas dans votre trousseau de clés ; rien ne permet donc de dire si la signature est authentique. Importez la clé de l&apos;expéditeur et vérifiez à nouveau.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>La signature a été apposée avec une clé qui a expiré, ou la signature elle-même a expiré. Elle peut être authentique malgré tout ; ce qui ne peut pas être confirmé, c&apos;est que la clé était valide au moment où elle a été utilisée.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>La signature ne correspond pas aux octets qu&apos;elle couvre. Soit le message a été modifié après avoir été signé, soit la signature n&apos;a pas été créée pour ce message.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>La vérification n&apos;a pas pu être menée à bien, on ne sait donc rien de cette signature, dans un sens comme dans l&apos;autre. Cela ne signifie pas que la signature est invalide.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Ce message prétend avoir été signé avec une signature OpenPGP, mais sa structure ne se prête pas assez à la vérification d&apos;une telle signature.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Les signatures de ce message couvrent les données chiffrées plutôt que le contenu que vous lisez. Elles confirment qui a chiffré le message, mais elle ne disent rien sur qui a écrit ce qui se trouve à l&apos;intérieur.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>Ce message ne contenait aucune signature à vérifier.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Remarque** : la partie signée n&apos;est pas sous forme canonique, car ses fins de ligne ne sont pas au format CRLF. Quelque chose a réécrit ce message après sa signature, généralement un programme qui a modifié les fins de ligne lors de l&apos;enregistrement ou de la copie. Une signature ne peut pas être vérifiée à partir de ces octets, et importer la clé de l&apos;expéditeur n&apos;y changera rien.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>Vérifier l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, une clé OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, non couvert par la signature</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>dans %1, mais pas chiffré pour elle : impossible à lire</translation>
+        <translation type="vanished">dans %1, mais pas chiffré pour elle : impossible à lire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>Déchiffrer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>Signer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>Chiffrer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Chiffrer et signer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Ce message n&apos;est pas signé, il n&apos;y a donc aucune signature à vérifier. Il a été déchiffré avec succès.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Le contenu déchiffré n&apos;est pas un message MIME, il n&apos;y a donc aucune signature à vérifier. Il a été déchiffré avec succès.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Ce message a été déchiffré. Il ne porte aucune signature, donc rien n&apos;indique qui l&apos;a envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Déchiffrer et vérifier l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Enregistrer le fichier</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Message e-mail (*.eml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>dans %1, mais non chiffré pour les destinataires : ils ne pourront pas lire ce message</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>chiffré pour, mais non listé dans les en-têtes</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>l&apos;expéditeur a retenu cet identifiant de clé</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Impossible d&apos;écrire le fichier %1 :
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 n&apos;est pas un fichier ordinaire, il ne peut donc pas être ouvert en tant que message.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>Le fichier %1 est trop volumineux (%2) pour être ouvert. La taille maximale autorisée est de %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ Si le problème persiste, envisagez de contacter le support technique ou de cons
         <translation type="vanished">Le fichier %1 est trop volumineux (%2 octets) pour être ouvert. La taille maximale autorisée est de 1 Mo.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Impossible de lire le fichier %1 :
@@ -1116,359 +1189,373 @@ Si le problème persiste, envisagez de contacter le support technique ou de cons
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>séparez plusieurs adresses par &quot;;&quot;</translation>
+        <translation type="vanished">séparez plusieurs adresses par &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Cci</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>À :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>Cc :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>Cci :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Objet :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Envoyer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Envoyer ce message via un compte de messagerie configuré.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Écrivez votre message ici.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Ajoutez un ou plusieurs fichiers à ce message. Vous pouvez également déposer des fichiers sur le message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Retirez les pièces jointes sélectionnées de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Enregistrer les pièces jointes sélectionnées dans un dossier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Enregistrer toutes les pièces jointes dans un dossier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Ce message est chiffré. Déchiffrez-le avant de le modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Ce message est chiffré et signé. Déchiffrez-le, puis supprimez la signature, avant de le modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Source brute</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Séparez plusieurs adresses par &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Message protégé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Ces octets sont couverts par une signature, ou sont du texte chiffré. Supprimez la signature, ou déchiffrez le message, avant de modifier sa source.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Arrêter la modification</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Modifier la source brute</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Vous modifiez la source brute du message. Ce que vous tapez ici est le document.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Ce message est verrouillé pour inspection. Sa source ne peut pas être modifiée.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Lecture seule. Déverrouillez pour modifier directement la source du message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Ce message est chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Déchiffrer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Ce message est chiffré et signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Les destinataires ne sont pas nommés dans les en-têtes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Adressé à %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>Les destinataires ne sont pas nommés, il est donc impossible de savoir si vous pouvez l&apos;ouvrir avant d&apos;essayer.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>joindre une clé publique</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>ajouter du texte à ce message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Message verrouillé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Ce message est ouvert en lecture seule ; il n&apos;est donc pas possible de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Message chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Déchiffrez ce message avant d’essayer de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Message signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>Ceci est un brouillon que vous rédigez encore, pas un message reçu, donc il n&apos;y a rien à traiter pour l&apos;instant.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Ce message ne peut de toute façon pas être modifié : il est signé ou chiffré, il est donc déjà protégé contre toute réécriture.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Aucun compte de messagerie n&apos;est configuré pour le moment. Ajoutez-en un dans Paramètres, sous Comptes de messagerie, et ce message pourra être envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Indiquez qui est l&apos;expéditeur de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>L&apos;adresse « De » ne ressemble pas à une adresse e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Ajoutez au moins un destinataire.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Donnez un objet à ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Ceci ne ressemble pas à une adresse e-mail : %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>La signature n&apos;a pas pu être vérifiée.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Structure OpenPGP malformée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>Ni signé ni chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Ce message est verrouillé pour inspection.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Chiffrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Chiffrer et signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Vérifier la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Détails de la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Signer à nouveau avec une autre clé...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Supprimer la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Déchiffrer et vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Détails du chiffrement...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Détails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Déchiffrez d&apos;abord ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Qu&apos;est-ce qui ne va pas avec ce message ?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Essayer de vérifier quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Essayer de déchiffrer quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Signature inaccessible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La signature se trouve dans la partie chiffrée de ce message. Déchiffrez-le d&apos;abord.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Rien à supprimer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Ce message ne comporte aucune signature.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>Impossible de supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Ce message ne respecte pas assez la RFC 3156 pour que sa signature puisse être retirée en toute sécurité. Modifiez plutôt la source brute.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La signature est abandonnée et le message devient un message ordinaire non signé. Le message lui-même est conservé tel quel. Cette action est irréversible.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>non signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>Impossible d&apos;envoyer</translation>
+        <translation type="vanished">Impossible d&apos;envoyer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Ce message nécessite un expéditeur et au moins un destinataire avant de pouvoir être envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Structure</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Détails du message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>En-têtes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Les destinataires en Cci ne sont jamais écrits dans le message : un en-tête Cci révélerait à chaque destinataire l&apos;identité des destinataires en Cci. Ils servent à sélectionner les destinataires du chiffrement et ne sont pas enregistrés avec le fichier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Afficher les champs Cc et Cci (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Afficher le message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Afficher le document brut</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Rédiger une réponse à l&apos;expéditeur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Répondre à tous</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Rédiger une réponse à l&apos;expéditeur et à tous les autres destinataires. Les destinataires en copie cachée ne sont pas inclus.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Transférer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Transmettre ce message avec ses pièces jointes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Lecture seule</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Verrouiller ce message afin qu&apos;il ne puisse pas être modifié ou réécrit. Répondre et Transférer fonctionnent toujours et produisent de nouveaux messages.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Afficher ce que l&apos;on sait de ce message : ses signatures, sa structure et ses en-têtes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Joindre un fichier...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Enregistrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Tout enregistrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Ce message est ouvert pour simple inspection. Il ne peut être ni modifié ni réécrit ; Répondre et Transférer restent disponibles et produisent de nouveaux messages.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Ce message est signé. Supprimez la signature avant de le modifier. Une modification sous une signature est perçue comme une falsification.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Ce message a été écrit en HTML. Il est affiché sous forme de source plutôt que rendu : rien ici ne charge d’images ni ne suit de liens.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Lecture seule. Ces octets sont protégés. Supprimez la signature ou déchiffrez le message pour les modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Ce message n’a pas pu être assemblé pour inspection, il n’y a donc rien à afficher ici. Le message lui-même est inchangé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>Impossible de répondre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>Impossible de répondre à tous</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>Impossible de faire suivre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Ce message lui-même n&apos;a pas été modifié.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>Un nouveau message ne peut pas être ouvert à partir d&apos;ici, car cette vue ne se trouve pas dans une fenêtre à onglets.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Le nouveau message n&apos;a pas pu être assemblé. Cela signifie généralement qu&apos;une partie du message original n&apos;a pas pu être réencodée, le plus souvent une pièce jointe.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Impossible d&apos;ouvrir un onglet pour le nouveau message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>Le nouvel onglet s&apos;est ouvert, mais il n&apos;affiche pas de vue de message, il n&apos;y a donc aucun endroit où mettre la réponse. L&apos;onglet peut être fermé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>Les destinataires ne sont pas nommés, on ne peut donc savoir si vous pouvez ouvrir ce message qu&apos;en essayant.</translation>
+        <translation type="vanished">Les destinataires ne sont pas nommés, on ne peut donc savoir si vous pouvez ouvrir ce message qu&apos;en essayant.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Vous ne détenez aucune clé privée pour ces adresses. À moins que le message n&apos;ait également été chiffré à destination d&apos;une clé qui n&apos;est pas nommée ici, il ne peut pas être ouvert sur cet ordinateur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>Vous détenez la clé privée pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>Vous détenez des clés privées pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 Supprimer la signature et en faire un message ordinaire ?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Chiffré, signature non vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Signature non vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Chiffré, signature vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Signature vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Signé par une adresse différente</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Signature ou clé expirée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Signé par une clé inconnue</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Mauvaise signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>signé, non vérifié</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>signé, impossible à vérifier</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>signature non valide</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Certaines parties sont en dehors de la section signée de ce message. Elles ne sont pas couvertes par la signature et auraient pu être ajoutées par n&apos;importe qui.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Message e-mail (*.eml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>Impossible d&apos;envoyer</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Joindre des fichiers</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 est un dossier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 n&apos;est pas un fichier ordinaire</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 est trop volumineux (%2) ; la taille maximale d&apos;une pièce jointe est %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1 : %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Supprimer la signature et en faire un message ordinaire ?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Supprimer la signature et en faire un message ordinaire ?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Importer une clé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Copier le nom</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Ouvrir la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Enregistrez-le plutôt et ouvrez-le vous-même si vous êtes sûr de sa provenance.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Impossible de créer un dossier temporaire pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>%1 n&apos;a pas pu être écrit pour être ouvert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Aucun programme de ce système n&apos;est enregistré pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Retirer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà été enregistrés, il s&apos;agit de la seule copie. Leur retrait est irréversible.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>1 fichier enregistré.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>%1 fichiers enregistrés.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Enregistrer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>Impossible d&apos;écrire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Enregistrer les pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>Impossible d&apos;écrire : %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
         <translation>valide, avec anomalies</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>valide, clé non entièrement fiable</translation>
+        <translation type="vanished">valide, clé non entièrement fiable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
         <translation>Importer la clé de ce message</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Vérifier les signatures</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Vérifier à nouveau</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Signatures</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Signature %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>couvre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>couvre %1, imbriqué à %2 niveaux</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Résultat</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>cette section est signée, mais rien ne l&apos;a encore vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>cette section est signée, mais sa vérification n&apos;a produit aucun résultat : la clé de signature n&apos;est peut-être pas dans votre trousseau de clés.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Signataire inconnu</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Adresse différente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>la signature est valide, mais la clé appartient à %1 alors que ce message indique qu&apos;elle provient de %2. Une signature valide indique qui a signé les octets, pas qui a envoyé le message.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Algorithme de clé publique</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Signé le</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Hash déclaré (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Hash de signature</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>Incohérence de hash</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>le message déclare %1 mais la signature a utilisé %2</translation>
+        <translation type="vanished">le message déclare %1 mais la signature a utilisé %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Destinataires</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>adressé et chiffré à</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>l&apos;expéditeur a choisi de ne pas indiquer qui est ce destinataire</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Ce message prétend utiliser OpenPGP, mais sa structure n&apos;est pas conforme à la RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>Il n&apos;y a rien d&apos;autre à signaler à propos de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Clé %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>valide, mais la clé n&apos;est pas entièrement fiable</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>le message déclare %1, mais la signature a utilisé %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>dans %1, mais non chiffré pour ce destinataire : ils ne peuvent pas lire ce message</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>chiffré à, mais pas dans les en-têtes visibles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Destinataire masqué</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>l&apos;expéditeur a choisi de ne pas indiquer de qui il s&apos;agit</translation>
+        <translation type="vanished">l&apos;expéditeur a choisi de ne pas indiquer de qui il s&apos;agit</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Empreinte</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>dans %1, mais pas chiffré à cette clé : ils ne peuvent pas lire ceci</translation>
+        <translation type="vanished">dans %1, mais pas chiffré à cette clé : ils ne peuvent pas lire ceci</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Remarque</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>le moteur a signalé la clé primaire plutôt que la sous-clé de chiffrement réellement utilisée</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Clés pour ces adresses</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>aucune clé trouvée</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 clés</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>la clé est %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Identité</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>cette adresse se trouve sur un ID utilisateur révoqué de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>cette adresse est l&apos;ID utilisateur principal de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>cette adresse est un ID utilisateur secondaire de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>cette clé ne peut pas être utilisée pour le chiffrement</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Ce qui ressort</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Ce message n&apos;est ni signé ni chiffré.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Ce message comporte une signature.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Ce message est chiffré.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Ce message est chiffré et comporte une signature.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Ce message prétend utiliser OpenPGP mais sa structure ne suit pas la RFC 3156.</translation>
+        <translation type="vanished">Ce message prétend utiliser OpenPGP mais sa structure ne suit pas la RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2395,7 +2515,7 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
         <translation>Copie dans Envoyés</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 port %2 · %3</translation>
     </message>
@@ -2416,189 +2536,189 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
         <translation>Copier les détails</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Ces adresses ne sont transmises qu’au serveur sortant. Elles n’apparaissent pas dans le message, donc aucun autre destinataire ne peut les voir.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>Aucun compte sortant n’est configuré.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>Aucun mot de passe n’est enregistré pour ce compte, donc rien ne peut être envoyé via celui-ci. Définissez le mot de passe dans Paramètres, sous Comptes de messagerie, et activez l’option permettant de le mémoriser.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Envoi en cours. Cette fenêtre indiquera ce qui s&apos;est passé.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>Ce compte est configuré pour l&apos;envoi uniquement, il n&apos;y a donc pas de boîte aux lettres pour y conserver une copie.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>une copie a été placée dans %1, mais elle ne peut pas être retrouvée ensuite : ce message ne comporte pas de Message-ID. Un message envoyé exactement tel qu&apos;il est arrivé n&apos;en reçoit jamais, car l&apos;ajouter modifierait des octets qu&apos;une signature pourrait couvrir.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>Aucun dossier « Envoyés » n&apos;a pu être identifié pour ce compte.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>la copie n&apos;a pas pu être écrite dans la boîte aux lettres.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>la copie n&apos;a pas pu être écrite dans la boîte aux lettres : %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Arrêt en cours...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Toujours en cours d&apos;envoi</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Ce message est toujours en cours d&apos;envoi.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>Le serveur a peut-être déjà accepté le message. Si vous fermez cette fenêtre maintenant, vous ne saurez pas s&apos;il a été remis, et l&apos;envoyer à nouveau pourrait le remettre deux fois.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Continuer à attendre</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Fermer quand même</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Pas encore envoyé</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Envoi...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Inconnu. La connexion a été perdue après l&apos;envoi du message, le serveur a donc pu ou non l&apos;accepter. Vérifiez le dossier Envoyés ou le destinataire avant de renvoyer : un renvoi pourrait le délivrer deux fois.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Oui, accepté par le serveur de courrier sortant</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>Non enregistré</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Enregistrement d&apos;une copie dans Envoyés...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>Aucune copie n&apos;a été conservée.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>Le message a été envoyé, mais %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>Aucun mot de passe n&apos;est enregistré pour ce compte, sa boîte aux lettres n&apos;a donc pas pu être ouverte.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>Impossible de joindre la boîte aux lettres.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>Impossible de joindre la boîte aux lettres : %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Attend que le message soit envoyé</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Oui, votre serveur de messagerie l&apos;avait déjà classé dans %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Oui, enregistré dans %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Arrêté : aucune copie n&apos;a été conservée. Le message a quand même été envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>On ne sait pas si ce message a été envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>Transmis au serveur de messagerie sortant.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>Non envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Fermer (%1)</translation>
     </message>
@@ -2669,10 +2789,14 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
-        <source>Cannot write %1.</source>
+        <source>Could not write %1.</source>
         <translation>Impossible d&apos;écrire %1.</translation>
     </message>
     <message>
+        <source>Cannot write %1.</source>
+        <translation type="vanished">Impossible d&apos;écrire %1.</translation>
+    </message>
+    <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
         <translation>SHA-256 de cette partie : %1</translation>
@@ -2750,36 +2874,245 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
         <source>That message is too large to open</source>
         <translation>Ce message est trop volumineux pour être ouvert</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>Le certificat du serveur est pour un hôte différent</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>Le certificat le serveur présente ne nomme pas l&apos;hôte que vous avez configuré. C&apos;est à cela que ressemble une interception, donc la connexion a été refusée. Vérifiez que le nom d&apos;hôte ne contient pas de faute de frappe.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>Le certificat du serveur n&apos;est actuellement pas valide</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>Le certificat a expiré ou n&apos;est pas encore valide. Si l&apos;horloge de votre ordinateur est fausse, corrigez-la d&apos;abord ; sinon, le certificat du serveur doit être renouvelé. Cela ne peut pas être contourné en accordant votre confiance au certificat.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>Le certificat du serveur n&apos;est pas approuvé</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>Le certificat n&apos;a pas été délivré par une autorité à laquelle votre système fait confiance. C&apos;est normal pour un serveur auto-hébergé avec son propre certificat. Vous pouvez l&apos;examiner et choisir de faire confiance à ce certificat précis pour ce compte.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>Le certificat du serveur n&apos;a pas pu être lu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>Le certificat est d&apos;un type que cette application ne peut pas vérifier, donc la connexion a été refusée.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>Le certificat du serveur a été rejeté.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>Le certificat n&apos;a pas pu être vérifié, donc la connexion a été refusée.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>Le serveur a rejeté l&apos;adresse de l&apos;expéditeur.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>Le serveur sortant n&apos;a pas accepté le courrier envoyé depuis cette adresse. Cela signifie généralement que l&apos;adresse ne correspond pas au compte avec lequel vous êtes connecté.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>Le serveur a refusé un destinataire</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>Le serveur a refusé le destinataire %1</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>Le message n&apos;a été envoyé à personne. Le serveur a refusé ce destinataire, et l&apos;envoi s&apos;arrête au premier refus. Corrigez ou supprimez l&apos;adresse et renvoyez.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>Le serveur a refusé le message</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>Le serveur sortant a accepté l&apos;expéditeur et les destinataires, mais a refusé le message lui-même. Sa réponse est affichée ci-dessous et explique généralement la raison, souvent à cause d&apos;une limite de taille ou d&apos;une politique de contenu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>Le serveur a refusé de démarrer une connexion chiffrée</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>La connexion a été fermée plutôt que de continuer sans chiffrement. Vérifiez si ce serveur attend un paramètre de sécurité ou un port différent.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>L&apos;authentification a été refusée</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>Le serveur n&apos;a pas accepté le nom d&apos;utilisateur et le mot de passe.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>Le dossier n&apos;a pas pu être ouvert</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>La recherche n&apos;a pas pu être terminée</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>Le message n&apos;a pas pu être récupéré</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>Le serveur a rejeté une commande</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>Le résultat est inconnu</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Arrêté</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>Le serveur a cessé de répondre</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>Le serveur n&apos;a pas accepté le nom d&apos;utilisateur et le mot de passe. Si ce compte appartient à un fournisseur qui exige une connexion par l&apos;intermédiaire de sa propre page web, un mot de passe ordinaire ne fonctionnera pas et vous devrez utiliser un mot de passe spécifique à l&apos;application à la place.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>Le message est trop volumineux pour ce serveur</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>Le serveur a envoyé une réponse inattendue</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>Le serveur est introuvable</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>Le nom d&apos;hôte n&apos;a pas pu être résolu. Vérifiez qu&apos;il ne comporte pas de faute de frappe et que cet ordinateur est en ligne.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>Le serveur est inaccessible</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>L&apos;hôte a été résolu, mais il a refusé ou ignoré la connexion. Vérifiez le port et les paramètres de sécurité, ainsi que l&apos;éventuelle présence d&apos;un pare-feu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>La connexion chiffrée n&apos;a pas pu être établie</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>Le serveur et cette application n&apos;ont pas pu s’accorder sur la sécurisation de la connexion. Un serveur qui ne propose qu’un chiffrement obsolète échouera ici, ce qui est voulu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>L’opération a échoué</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 n’a pas démarré de connexion chiffrée</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>La connexion a été fermée plutôt que poursuivie sans chiffrement, votre mot de passe n’a donc jamais été envoyé. Vérifiez si ce serveur attend un autre paramètre de sécurité ou un autre port.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>Un problème est survenu dans cette application.</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>Éditeur de courriel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Ouvrir un nouvel éditeur de texte pour courriel.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>Ouvrir le contrôleur IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>Ouvrir la boîte de dialogue du contrôleur IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>Aucun compte de courriel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Configurez d&apos;abord un compte de courriel avec IMAP activé dans les paramètres.</translation>
     </message>
@@ -2787,172 +3120,188 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>La partie signée n&apos;est plus sous forme canonique</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>La partie signée contient des fins de ligne qui ne sont pas des CRLF, ce qui n&apos;est pas la forme sur laquelle une signature est calculée. Quelque chose a réécrit ce message après sa signature, généralement un programme qui a modifié les fins de ligne lors de l&apos;enregistrement ou de la copie, plutôt qu&apos;une attaque. La signature ne peut pas être vérifiée sur ces octets, et importer la clé de l&apos;expéditeur n&apos;y changera rien. Pour la vérifier, il faut le message d&apos;origine, non modifié.</translation>
+        <translation type="vanished">La partie signée contient des fins de ligne qui ne sont pas des CRLF, ce qui n&apos;est pas la forme sur laquelle une signature est calculée. Quelque chose a réécrit ce message après sa signature, généralement un programme qui a modifié les fins de ligne lors de l&apos;enregistrement ou de la copie, plutôt qu&apos;une attaque. La signature ne peut pas être vérifiée sur ces octets, et importer la clé de l&apos;expéditeur n&apos;y changera rien. Pour la vérifier, il faut le message d&apos;origine, non modifié.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>En-tête %1 en double</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Ce message contient %1 copies d&apos;un en-tête qui ne peut apparaître qu&apos;une seule fois. Différents programmes de messagerie sélectionnent des copies différentes, ce que vous voyez ici peut donc différer de ce qu&apos;un autre lecteur verra.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>L&apos;adresse peut être déguisée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>Le domaine dans « %1 » utilise des caractères qui peuvent être conçus pour ressembler à une autre adresse connue.</translation>
+        <translation type="vanished">Le domaine dans « %1 » utilise des caractères qui peuvent être conçus pour ressembler à une autre adresse connue.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Les réponses vont ailleurs</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Ce message provient de « %1 », mais les réponses seraient envoyées à « %2 », qui est un domaine différent.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>La partie signée contient des fins de ligne qui ne sont pas au format CRLF, ce qui ne correspond pas à la forme sur laquelle la signature a été calculée. Quelque chose a réécrit ce message après sa signature, généralement un programme qui a modifié les fins de ligne lors de l&apos;enregistrement ou de la copie, et non une attaque. La signature ne peut pas être vérifiée à partir de ces octets, et l&apos;importation de la clé de l&apos;expéditeur n&apos;y changera rien. La vérification nécessite le message original non modifié.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>Le domaine « %1 » utilise des caractères qui peuvent être conçus pour ressembler à une autre adresse connue.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Ce message provient de « %1 », mais les réponses seraient envoyées à « %2 », qui est un domaine différent.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Section signée malformée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Une section signée doit contenir exactement deux parties ; celle-ci en contient %1. Elle pourrait ne pas être vérifiable et ce qu&apos;elle couvre est ambigu.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Section chiffrée malformée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Une section chiffrée doit contenir exactement deux parties ; celle-ci en contient %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>Tout n&apos;est pas signé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>%1 partie(s) de ce message se trouvent en dehors de la signature. Elles sont arrivées non authentifiées et ont pu être ajoutées ou modifiées par n&apos;importe qui en cours de route.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>La signature ne couvre que les données chiffrées</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Cette signature a été apposée sur le bloc chiffré, pas sur le message qu&apos;il contient. Elle indique qui a envoyé le texte chiffré ; elle ne dit pas qui a écrit ce que vous lisez, et n&apos;importe qui aurait pu signer une copie de ce même bloc.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Clé publique jointe</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Ce message contient %1 clé(s) publique(s) OpenPGP. Une clé arrivant dans un message ne prouve rien sur son expéditeur : n&apos;importe qui peut joindre n&apos;importe quelle clé, y compris une clé créée pour le nom sur la ligne De.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Signature détachée jointe</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Ce message contient %1 fichier(s) de signature qui ne font pas partie de sa propre structure signée. L&apos;ouverture du message ne les vérifie pas ; ils signent autre chose.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>Les destinataires en copie cachée sont visibles</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Ce message comporte un en-tête Cci nommant %1 destinataire(s). Toute personne qui l&apos;a reçu peut voir qui a été mis en copie cachée.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Rien n&apos;est signé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Ce message ne comporte aucune signature, le destinataire ne peut donc pas savoir qu&apos;il provient de vous ni qu&apos;il est arrivé inchangé.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Certaines parties ne sont pas signées</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>La signature ne couvrira pas %1 partie(s) de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Destinataires cachés</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>Le chiffrement inclura %1 destinataire(s) caché(s), invisible(s) dans le message.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>En-tête Cci présent</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Ce message comporte un en-tête Cci. L&apos;envoyer révélerait à tous les destinataires les noms de ceux qui étaient en copie cachée.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>Destinataire possiblement déguisé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>Le domaine dans « %1 » utilise des caractères qui peuvent être conçus pour ressembler à une autre adresse. Vérifiez avant d&apos;envoyer.</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>Le domaine dans « %1 » utilise des caractères qui peuvent être dessinés pour ressembler à une adresse différente. Vérifiez avant d&apos;envoyer.</translation>
+        <translation type="vanished">Le domaine dans « %1 » utilise des caractères qui peuvent être dessinés pour ressembler à une adresse différente. Vérifiez avant d&apos;envoyer.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Aucun destinataire</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Ce message n&apos;est adressé à personne.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.it_IT.ts b/src/m_email/ts/ModuleEMail.it_IT.ts
index e452dae..1af2934 100644
--- a/src/m_email/ts/ModuleEMail.it_IT.ts
+++ b/src/m_email/ts/ModuleEMail.it_IT.ts
@@ -224,8 +224,12 @@ Verra dimenticata anche la password memorizzata. Questa operazione non può esse
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Un altro account usa già questo indirizzo. Non è possibile distinguerli ovunque vengano offerti gli account.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Un altro account usa già questo indirizzo. Non è possibile distinguerli dove vengono offerti gli account.</translation>
+        <translation type="vanished">Un altro account usa già questo indirizzo. Non è possibile distinguerli dove vengono offerti gli account.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Usa Aggiorna per riprovare.</translation>
         <translation>Scegli un account da aprire.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>Nessuna password è memorizzata per questo account. Impostane una in Impostazioni, sotto Account di posta, quindi usa Riprova.</translation>
+        <translation type="vanished">Nessuna password è memorizzata per questo account. Impostane una in Impostazioni, sotto Account di posta, quindi usa Riprova.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Usa Aggiorna per riprovare.</translation>
         <translation>Data non indicata</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>Questo messaggio è più grande di quanto questa applicazione possa aprire, quindi non può essere importato.</translation>
+        <translation type="vanished">Questo messaggio è più grande di quanto questa applicazione possa aprire, quindi non può essere importato.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>Nessuna password è memorizzata per questo account. Impostane una in Impostazioni, sotto Account di posta, quindi usa Aggiorna.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>Questo messaggio è troppo grande per essere aperto da questa applicazione, quindi non può essere importato.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Usa Aggiorna per riprovare.</translation>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML è un formato file per la rappresentazione di messaggi email, che include ti
 Dopo aver corretto i dati EML, riprovare l&apos;operazione.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ Si è verificato un errore durante l&apos;operazione email. Il processo non è s
 Se il problema persiste, si consiglia di contattare il supporto tecnico o consultare la documentazione.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>Da</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Oggetto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ Se il problema persiste, si consiglia di contattare il supporto tecnico o consul
         <translation type="vanished">Algoritmo di controllo integrità messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Digest dell&apos;entità MIME firmata (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Hash dichiarato della firma (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Allegati</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Destinatario cifratura</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>ID chiave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>cifrato per</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>cifrato per, non nelle intestazioni</translation>
+        <translation type="vanished">cifrato per, non nelle intestazioni</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Destinatario nascosto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>il mittente non ha rivelato questo ID chiave</translation>
+        <translation type="vanished">il mittente non ha rivelato questo ID chiave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Controllo destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>Dettagli</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Decifra</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Verifica</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>FIRMATARIO</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Controlla prima di esportare</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>C&apos;è qualcosa in questo messaggio che vale la pena controllare prima di salvarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>I byte coperti dalla firma sono stati riscritti dopo la sua creazione: le loro terminazioni di riga non sono più CRLF. Di solito ciò è causato da un programma che le ha modificate durante il salvataggio o la copia del messaggio. Per verificare la firma sono necessari i byte originali.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>La firma è valida e la chiave che l&apos;ha creata parla per l&apos;indirizzo da cui il messaggio dichiara di provenire.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>La firma in sé è valida, ma la chiave che l&apos;ha creata non parla per l&apos;indirizzo da cui il messaggio dichiara di provenire. È l&apos;aspetto di una firma spostata da un altro messaggio, quindi vale la pena controllare chi sia il firmatario prima di fidarsi del contenuto.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>La chiave che ha apposto questa firma non è nel tuo portachiavi, quindi nulla qui può dire se la firma sia autentica. Importa la chiave del mittente e verifica di nuovo.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>La firma è stata creata con una chiave scaduta, oppure è la firma stessa a essere scaduta. Potrebbe essere comunque autentica; ciò che non si può confermare è che la chiave fosse valida al momento in cui è stata usata.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>La firma non corrisponde ai byte che copre. O il messaggio è stato modificato dopo essere stato firmato, oppure la firma non è stata creata per questo messaggio.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>Il controllo non ha potuto essere completato, quindi non si sa nulla di questa firma in alcun senso. Non è una dichiarazione che la firma sia errata.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Questo messaggio dichiara di contenere una firma OpenPGP, ma la sua struttura non è abbastanza solida da permetterne la verifica.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Le firme in questo messaggio coprono i dati cifrati, non il contenuto che leggi. Confermano chi ha cifrato il messaggio, ma non dicono nulla su chi abbia scritto ciò che contiene.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>Non c&apos;era alcuna firma in questo messaggio da verificare.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Nota**: la parte firmata non è in forma canonica, perché i suoi terminatori di riga non sono CRLF. Qualcosa ha riscritto questo messaggio dopo la firma, di solito un programma che ha modificato i terminatori di riga durante il salvataggio o la copia. Una firma non può essere verificata su questi byte e importare la chiave del mittente non cambierà le cose.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>Verifica Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, una chiave OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, non coperta dalla firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>in %1, ma non cifrato per essa: impossibile leggere</translation>
+        <translation type="vanished">in %1, ma non cifrato per essa: impossibile leggere</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>Decifra Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>Firma Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>Cifra Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Cifra e firma Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Questo messaggio non è firmato, quindi non c&apos;è alcuna firma da verificare. È stato decifrato correttamente.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Il contenuto decifrato non è un messaggio MIME, quindi non c&apos;è alcuna firma da verificare. È stato decifrato correttamente.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Questo messaggio è stato decifrato. Non reca alcuna firma, quindi nulla qui indica chi lo ha inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Decifra e verifica Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Messaggio email (*.eml);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>in %1, ma non cifrato per essa: non possono leggere questo messaggio</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>cifrato per, ma non elencato nelle intestazioni</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>il mittente ha omesso questo ID chiave</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Impossibile scrivere il file %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 non è un file ordinario, quindi non può essere aperto come messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>Il file %1 è troppo grande (%2) per essere aperto. La dimensione massima consentita è %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ Se il problema persiste, si consiglia di contattare il supporto tecnico o consul
         <translation type="vanished">Il file %1 è troppo grande (%2 byte) per essere aperto. La dimensione massima consentita è 1 MB.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Impossibile leggere il file %1:
@@ -1116,359 +1189,373 @@ Se il problema persiste, si consiglia di contattare il supporto tecnico o consul
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>separare più indirizzi con &quot;;&quot;</translation>
+        <translation type="vanished">separare più indirizzi con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Ccn</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>Ccn:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Oggetto:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Invia...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Invia questo messaggio tramite un account di posta configurato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Scrivi qui il tuo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Aggiungi uno o più file a questo messaggio. I file possono anche essere trascinati sul messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Rimuovi gli allegati selezionati da questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Salva gli allegati selezionati in una cartella.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Salva tutti gli allegati in una cartella.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Questo messaggio è cifrato. Decifralo prima di modificarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Questo messaggio è cifrato e firmato. Decifralo, quindi rimuovi la firma, prima di modificarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Sorgente grezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Separa più indirizzi con &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Messaggio protetto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Questi byte sono coperti da una firma, oppure sono testo cifrato. Rimuovi la firma o decifra il messaggio prima di modificarne la sorgente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Interrompi modifica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Modifica sorgente grezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Stai modificando la sorgente grezza del messaggio. Quello che digiti qui è il documento.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Questo messaggio è bloccato per ispezione. La sua sorgente non può essere modificata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Sola lettura. Sblocca per modificare direttamente la sorgente del messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Questo messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Decifra</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Questo messaggio è cifrato e firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>I destinatari non sono indicati nelle intestazioni.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Destinatario: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>I destinatari non sono indicati, quindi non è possibile sapere se puoi aprirlo finché non provi.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>Allega una chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>Aggiungi testo a questo messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Messaggio bloccato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Questo messaggio è aperto solo per ispezione, quindi non è possibile %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Il messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Decifra questo messaggio prima di provare a %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Il messaggio è firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>Questa è una bozza che stai ancora scrivendo, non un messaggio ricevuto, quindi non c&apos;è ancora nulla su cui agire.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Questo messaggio non può comunque essere modificato: è firmato o cifrato, quindi è già protetto dalla riscrittura.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Nessun account di posta è ancora configurato. Aggiungine uno in Impostazioni, sotto Account di posta, e questo messaggio potrà essere inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Indica il mittente di questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>L&apos;indirizzo del mittente non sembra un indirizzo e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Aggiungi almeno un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Assegna un oggetto a questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Questo non sembra un indirizzo e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>Impossibile verificare la firma</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Struttura OpenPGP malformata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>Né firmato né cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Questo messaggio è bloccato per ispezione.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Cifra...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Cifra e firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Verifica firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Dettagli firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Rifirma con un&apos;altra chiave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Rimuovi firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Decifra e verifica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Dettagli di cifratura...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Dettagli...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Decifra prima questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Cosa c&apos;è che non va in questo messaggio?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Prova comunque a verificare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Prova comunque a decifrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Firma non raggiungibile</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La firma si trova nella parte cifrata di questo messaggio. Decifra prima il messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Nulla da rimuovere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Questo messaggio non contiene alcuna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>Impossibile rimuovere la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Questo messaggio non segue abbastanza fedelmente la RFC 3156 per poterne rimuovere la firma in sicurezza. Modifica invece il sorgente grezzo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Rimuovi firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La firma viene eliminata e il messaggio diventa un normale messaggio non firmato. Il messaggio stesso viene mantenuto esattamente com&apos;è. Questa operazione non può essere annullata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>non firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>Impossibile inviare</translation>
+        <translation type="vanished">Impossibile inviare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Questo messaggio richiede un mittente e almeno un destinatario prima di poter essere inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Struttura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Dettagli del messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>Intestazioni</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 I destinatari in copia nascosta non vengono mai scritti nel messaggio: un&apos;intestazione Ccn rivelerebbe a ogni destinatario chi era in copia nascosta. Vengono usati per scegliere i destinatari della cifratura e non vengono salvati con il file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Mostra copia conoscenza e copia conoscenza nascosta (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Mostra il messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Mostra il documento grezzo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Scrivi una risposta al mittente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Rispondi a tutti</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Scrivi una risposta al mittente e a tutti gli altri destinatari del messaggio. I destinatari in copia nascosta non sono inclusi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Inoltra</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Inoltra questo messaggio, con i relativi allegati.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Sola lettura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Blocca questo messaggio in modo che non possa essere modificato o riscritto. Rispondi e Inoltra continuano a funzionare e creano nuovi messaggi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Mostra ciò che è noto su questo messaggio: le sue firme, la sua struttura e le sue intestazioni.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Allega file...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Salva...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Salva tutti...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Questo messaggio è aperto solo per ispezione. Non può essere modificato o riscritto; Rispondi e Inoltra funzionano ancora e producono nuovi messaggi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Questo messaggio è firmato. Rimuovi la firma prima di modificarlo. Una modifica sotto una firma viene considerata una falsificazione.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Questo messaggio è stato scritto in HTML. Viene mostrato come sorgente, non renderizzato: nulla qui carica immagini né segue collegamenti.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Sola lettura. Questi byte sono protetti. Rimuovi la firma o decifra il messaggio per modificarli.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Non è stato possibile assemblare questo messaggio per l&apos;ispezione, quindi non c&apos;è nulla da mostrare qui. Il messaggio stesso è invariato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>Impossibile rispondere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>Impossibile rispondere a tutti</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>Impossibile inoltrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Il messaggio stesso non è stato modificato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>Non è possibile aprire un nuovo messaggio da qui, perché questa vista non si trova in una finestra che contiene schede.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Il nuovo messaggio non ha potuto essere assemblato. Di solito significa che una parte dell&apos;originale non ha potuto essere ricodificata, il più delle volte un allegato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Non è stato possibile aprire una scheda per il nuovo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>La nuova scheda si è aperta, ma non mostra una vista del messaggio, quindi non c&apos;è dove inserire la risposta. La scheda può essere chiusa.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>I destinatari non sono indicati, quindi se puoi aprire questo messaggio non si può sapere finché non provi.</translation>
+        <translation type="vanished">I destinatari non sono indicati, quindi se puoi aprire questo messaggio non si può sapere finché non provi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Non possiedi una chiave privata per nessuno di questi indirizzi. A meno che il messaggio non sia stato cifrato anche con una chiave non indicata qui, non può essere aperto su questo computer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>Possiedi la chiave privata per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>Possiedi chiavi private per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Cifrato, firma non verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Firma non verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Cifrato, firma verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Firma verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Firmato da un indirizzo diverso</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Firma o chiave scaduta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Firmato da una chiave sconosciuta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Firma errata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>firmato, non verificato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>firmato, impossibile verificare</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>firma non valida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Alcune parti sono al di fuori della sezione firmata di questo messaggio. Non sono coperte dalla firma e potrebbero essere state aggiunte da chiunque.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Messaggio e-mail (*.eml);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>Impossibile inviare</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Allega file</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 è una cartella</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 non è un file ordinario</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 è troppo grande (%2); la dimensione massima allegabile è %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Importa chiave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Copia nome</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Apri allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Salvalo invece e aprilo tu stesso se sei sicuro della sua provenienza.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Non è stato possibile creare una cartella temporanea da cui aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Non è stato possibile scrivere %1 per aprirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nessun programma su questo sistema è registrato per aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Rimuovi allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file non siano già stati salvati, questa è l&apos;unica copia. La rimozione non può essere annullata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>Salvato 1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>Salvati %1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Salva allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>Impossibile scrivere %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Salva allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>Impossibile scrivere: %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
         <translation>valido, con problemi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>valido, chiave non completamente attendibile</translation>
+        <translation type="vanished">valido, chiave non completamente attendibile</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
         <translation>Importa la chiave da questo messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Verifica firme</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Verifica di nuovo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Firme</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Firma %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>copre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>copre %1, annidata a profondità %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Risultato</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>questa sezione è firmata, ma non è stata ancora verificata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>questa sezione è firmata, ma la verifica non ha prodotto alcun risultato: la chiave di firma potrebbe non essere nel tuo portachiavi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Firmatario sconosciuto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Indirizzo diverso</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>la firma è valida, ma la chiave appartiene a %1 mentre questo messaggio dice che proviene da %2. Una firma valida indica chi ha firmato i byte, non chi ha inviato il messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Algoritmo a chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Firmato il</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Hash dichiarato (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Hash della firma</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>Hash non corrispondente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>il messaggio dichiara %1 ma la firma ha usato %2</translation>
+        <translation type="vanished">il messaggio dichiara %1 ma la firma ha usato %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Destinatari</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>indirizzato e cifrato a</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>il mittente ha scelto di non indicare chi è questo destinatario</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Questo messaggio dichiara di usare OpenPGP, ma la sua struttura non segue la RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>Non c&apos;è altro da segnalare su questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Chiave %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>valida, ma chiave non completamente attendibile</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>il messaggio dichiara %1, ma la firma ha usato %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>in %1, ma non cifrata per essa: non possono leggere questo messaggio</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>cifrato a, ma non nelle intestazioni visibili</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Destinatario nascosto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>il mittente ha scelto di non indicare chi è</translation>
+        <translation type="vanished">il mittente ha scelto di non indicare chi è</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Impronta digitale</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>in %1, ma non cifrato per esso: non possono leggerlo</translation>
+        <translation type="vanished">in %1, ma non cifrato per esso: non possono leggerlo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>il motore ha riportato la chiave primaria invece della sottochiave di cifratura effettivamente utilizzata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Chiavi per questi indirizzi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>nessuna chiave trovata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 chiavi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>la chiave è %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Identità</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>questo indirizzo si trova su un ID utente REVOCATO della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>questo indirizzo è l&apos;ID utente primario della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>questo indirizzo è un ID utente secondario della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>questa chiave non può essere utilizzata per la cifratura</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Cosa spicca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Questo messaggio non è firmato né cifrato.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Questo messaggio contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Questo messaggio è cifrato.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Questo messaggio è cifrato e contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Questo messaggio dichiara di usare OpenPGP, ma la sua struttura non segue la RFC 3156.</translation>
+        <translation type="vanished">Questo messaggio dichiara di usare OpenPGP, ma la sua struttura non segue la RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2395,7 +2515,7 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
         <translation>Copia in Inviati</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 porta %2 · %3</translation>
     </message>
@@ -2416,189 +2536,189 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
         <translation>Copia dettagli</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Questi indirizzi vengono forniti solo al server di posta in uscita. Non compaiono nel messaggio, quindi nessun altro destinatario può vederli.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>Nessun account di posta in uscita è configurato.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>Nessuna password è memorizzata per questo account, quindi non è possibile inviare nulla tramite esso. Imposta la password in Impostazioni, sotto Account di posta, e attiva l&apos;opzione per ricordarla.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Invio in corso. Questa finestra mostrerà cosa è successo.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>Questo account è configurato solo per l&apos;invio, quindi non c&apos;è una casella di posta in cui conservare una copia.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>una copia è stata inserita in %1, ma non può essere recuperata in seguito: questo messaggio non ha un Message-ID. Un messaggio inviato esattamente come arrivato non ne riceve mai uno, perché aggiungerlo modificherebbe byte che una firma potrebbe coprire.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>non è stato possibile identificare alcuna cartella Inviati per questo account.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>non è stato possibile scrivere la copia nella casella di posta.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>non è stato possibile scrivere la copia nella casella di posta: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Arresto...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Invio ancora in corso</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Questo messaggio è ancora in fase di invio.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>Il server potrebbe averlo già accettato. Se chiudi questa finestra ora, non saprai se è stato consegnato e inviarlo di nuovo potrebbe consegnarlo due volte.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Attendi ancora</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Chiudi comunque</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Non ancora inviato</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Invio in corso...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Sconosciuto. La connessione è stata persa dopo l&apos;invio del messaggio, quindi il server potrebbe averlo accettato o meno. Controlla la cartella Inviati o il destinatario prima di inviare di nuovo: un nuovo invio potrebbe consegnarlo due volte.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Sì, accettato dal server di posta in uscita</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>Non salvato</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Salvataggio di una copia in Inviati...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>Nessuna copia è stata conservata.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>Il messaggio è stato inviato, ma %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>Nessuna password è memorizzata per questo account, quindi non è stato possibile aprire la casella di posta.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>Impossibile raggiungere la casella di posta.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>Impossibile raggiungere la casella di posta: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Attende che il messaggio venga inviato</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Sì, il server di posta l&apos;ha già archiviata in %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Sì, salvata in %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Interrotto: nessuna copia è stata conservata. Il messaggio è stato comunque inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>Non è noto se sia stato inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>Consegnato al server di posta in uscita.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>Non inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Chiudi (%1)</translation>
     </message>
@@ -2669,8 +2789,12 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
+        <source>Could not write %1.</source>
+        <translation>Non è stato possibile scrivere %1.</translation>
+    </message>
+    <message>
         <source>Cannot write %1.</source>
-        <translation>Impossibile scrivere %1.</translation>
+        <translation type="vanished">Impossibile scrivere %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
@@ -2750,36 +2874,245 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
         <source>That message is too large to open</source>
         <translation>Quel messaggio è troppo grande per essere aperto</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>Il certificato del server è per un host diverso.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>Il certificato presentato dal server non indica l&apos;host che hai configurato. Questo è l&apos;aspetto di un&apos;intercettazione, quindi la connessione è stata rifiutata. Controlla se il nome dell&apos;host contiene un errore di battitura.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>Il certificato del server non è attualmente valido.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>Il certificato è scaduto o non è ancora valido. Se l&apos;orologio del computer è sbagliato, correggilo prima; altrimenti il certificato del server deve essere rinnovato. Non è possibile aggirare questo controllo considerando attendibile il certificato.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>Il certificato del server non è attendibile.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>Il certificato non è stato rilasciato da un&apos;autorità di certificazione considerata attendibile dal tuo sistema. Questo è previsto per un server self-hosted con un proprio certificato. Puoi esaminarlo e scegliere di considerare attendibile questo specifico certificato per questo account.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>Non è stato possibile leggere il certificato del server.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>Il certificato è di un tipo che questa applicazione non può verificare, quindi la connessione è stata rifiutata.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>Il certificato del server è stato rifiutato.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>Non è stato possibile verificare il certificato, quindi la connessione è stata rifiutata.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>Il server ha rifiutato l&apos;indirizzo del mittente.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>Il server di posta in uscita non accetta messaggi da questo indirizzo. Di solito significa che l&apos;indirizzo non corrisponde all&apos;account con cui hai effettuato l&apos;accesso.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>Il server ha rifiutato un destinatario</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>Il server ha rifiutato il destinatario %1</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>Il messaggio non è stato inviato a nessuno. Il server ha rifiutato questo destinatario e l&apos;invio si interrompe al primo rifiuto. Correggi o rimuovi l&apos;indirizzo e invia di nuovo.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>Il server ha rifiutato il messaggio</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>Il server di posta in uscita ha accettato il mittente e i destinatari ma ha rifiutato il messaggio stesso. La sua risposta è mostrata di seguito e di solito spiega il motivo, spesso per un limite di dimensione o una policy sui contenuti.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>Il server ha rifiutato di avviare una connessione cifrata</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>La connessione è stata chiusa invece di continuare in modo non cifrato. Controlla se questo server prevede un&apos;impostazione di sicurezza o una porta diversi.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>Accesso rifiutato</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>Il server non ha accettato nome utente e password.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>Impossibile aprire la cartella</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>Impossibile completare la ricerca</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>Impossibile recuperare il messaggio</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>Il server ha rifiutato un comando</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>L&apos;esito è sconosciuto</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Interrotto</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>Il server ha smesso di rispondere</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>Il server non ha accettato nome utente e password. Se questo account appartiene a un provider che richiede l&apos;accesso tramite la propria pagina web, una password normale non funzionerà e sarà invece necessaria una password specifica per l&apos;app.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>Il messaggio è troppo grande per questo server</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>Il server ha inviato una risposta imprevista</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>Il server non è stato trovato</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>Il nome host non è stato risolto. Controlla che non ci siano errori di battitura e che questo computer sia online.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>Impossibile raggiungere il server</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>L&apos;host è stato risolto, ma ha rifiutato o ignorato la connessione. Controlla la porta e le impostazioni di sicurezza e se un firewall è di mezzo.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>Impossibile stabilire la connessione crittografata</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>Il server e questa applicazione non sono riusciti a concordare come proteggere la connessione. Un server che offre solo crittografia obsoleta fallirà qui, e questo è intenzionale.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>L&apos;operazione non è riuscita</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 non ha avviato una connessione crittografata</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>La connessione è stata chiusa anziché continuare senza crittografia, quindi la tua password non è mai stata inviata. Controlla se questo server richiede un&apos;impostazione di sicurezza diversa o una porta diversa.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>Qualcosa è andato storto all&apos;interno di questa applicazione</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>Editor di posta</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Apri un nuovo editor di testo per email.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>Apri Controller IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>Apri il dialogo Controller IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>Nessun account di posta</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Configura prima un account di posta con IMAP abilitato nelle Impostazioni.</translation>
     </message>
@@ -2787,172 +3120,188 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>La parte firmata non è più nella forma canonica</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>La parte firmata contiene terminazioni di riga che non sono CRLF, che non è la forma su cui viene calcolata una firma. Qualcosa ha riscritto questo messaggio dopo che è stato firmato, di solito un programma che ha cambiato le terminazioni di riga durante il salvataggio o la copia, più che un attacco. La firma non può essere verificata su questi byte e importare la chiave del mittente non cambierà le cose. Per verificarla serve il messaggio originale, non modificato.</translation>
+        <translation type="vanished">La parte firmata contiene terminazioni di riga che non sono CRLF, che non è la forma su cui viene calcolata una firma. Qualcosa ha riscritto questo messaggio dopo che è stato firmato, di solito un programma che ha cambiato le terminazioni di riga durante il salvataggio o la copia, più che un attacco. La firma non può essere verificata su questi byte e importare la chiave del mittente non cambierà le cose. Per verificarla serve il messaggio originale, non modificato.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>Intestazione %1 duplicata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Questo messaggio contiene %1 copie di un&apos;intestazione che può apparire una sola volta. Programmi di posta diversi scelgono copie diverse, quindi ciò che vedi qui potrebbe non essere ciò che vede un altro lettore.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>L&apos;indirizzo potrebbe essere camuffato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>Il dominio in &quot;%1&quot; usa caratteri che possono essere visualizzati in modo da sembrare un indirizzo diverso e familiare.</translation>
+        <translation type="vanished">Il dominio in &quot;%1&quot; usa caratteri che possono essere visualizzati in modo da sembrare un indirizzo diverso e familiare.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Le risposte vanno altrove</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Questo messaggio proviene da &quot;%1&quot;, ma le risposte verrebbero inviate a &quot;%2&quot;, che è un dominio diverso.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>La parte firmata contiene terminatori di riga che non sono CRLF, che non è la forma su cui è stata calcolata la firma. Qualcosa ha riscritto questo messaggio dopo che è stato firmato, di solito un programma che ha cambiato i terminatori di riga durante il salvataggio o la copia, non un attacco. La firma non può essere verificata rispetto a questi byte e importare la chiave del mittente non cambierà le cose. Per verificarla serve il messaggio originale, non modificato.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>Il dominio in &quot;%1&quot; usa caratteri che possono essere fatti sembrare un indirizzo diverso e familiare.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Questo messaggio proviene da &quot;%1&quot;, ma le risposte verrebbero inviate a &quot;%2&quot;, che è un dominio diverso.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Sezione firmata malformata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Una sezione firmata deve contenere esattamente due parti; questa ne contiene %1. Potrebbe non superare la verifica e ciò che copre è ambiguo.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Sezione cifrata malformata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Una sezione cifrata deve contenere esattamente due parti; questa ne contiene %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>Non tutto è firmato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>%1 parte/i di questo messaggio si trovano al di fuori della firma. Sono arrivate non autenticate e chiunque nel percorso potrebbe averle aggiunte o modificate.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>La firma copre solo i dati cifrati</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Questa firma è stata apposta sul blocco cifrato, non sul messaggio al suo interno. Indica chi ha inviato il testo cifrato, non dice chi ha scritto ciò che stai leggendo, e chiunque potrebbe aver firmato una copia dello stesso blocco.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Chiave pubblica allegata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Questo messaggio contiene %1 chiave/i pubblica/e OpenPGP. Una chiave che arriva in un messaggio non prova nulla sull&apos;identità del mittente: chiunque può allegare qualsiasi chiave, anche una creata per il nome nel campo Da.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Firma separata allegata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Questo messaggio contiene %1 file di firma che non fanno parte della sua struttura firmata. L&apos;apertura del messaggio non li verifica; firmano qualcos&apos;altro.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>I destinatari in copia nascosta sono visibili</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Questo messaggio riporta un&apos;intestazione Bcc che elenca %1 destinatario/i. Chiunque lo abbia ricevuto può vedere chi è stato messo in copia nascosta.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Nulla è firmato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Questo messaggio non contiene alcuna firma, quindi il destinatario non può sapere che proviene da te o che è arrivato senza modifiche.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Alcune parti non sono firmate</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>La firma non coprirebbe %1 parte/i di questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Destinatari nascosti</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>La cifratura includerà %1 destinatario/i in copia nascosta, che non compariranno nel messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>Intestazione Bcc presente</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Questo messaggio contiene un&apos;intestazione Bcc. Inviandolo, ogni destinatario saprebbe chi è stato messo in copia nascosta.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>Il destinatario potrebbe essere camuffato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>Il dominio in &quot;%1&quot; usa caratteri che possono essere fatti sembrare un indirizzo diverso. Controllalo prima di inviare.</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>Il dominio in &quot;%1&quot; utilizza caratteri che possono essere resi simili a un indirizzo diverso. Controllalo prima di inviare.</translation>
+        <translation type="vanished">Il dominio in &quot;%1&quot; utilizza caratteri che possono essere resi simili a un indirizzo diverso. Controllalo prima di inviare.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Nessun destinatario</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Questo messaggio non è indirizzato a nessuno.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.pl_PL.ts b/src/m_email/ts/ModuleEMail.pl_PL.ts
index 7337f1c..820ba37 100644
--- a/src/m_email/ts/ModuleEMail.pl_PL.ts
+++ b/src/m_email/ts/ModuleEMail.pl_PL.ts
@@ -224,8 +224,12 @@ Zapisane hasło również zostanie zapomniane. Tej operacji nie można cofnąć
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Inne konto już używa tego adresu. Nie można ich rozróżnić, gdziekolwiek oferowane są konta.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Inne konto już używa tego adresu. Nie można ich rozróżnić, gdy oferowane są konta.</translation>
+        <translation type="vanished">Inne konto już używa tego adresu. Nie można ich rozróżnić, gdy oferowane są konta.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Użyj opcji Odśwież, aby spróbować ponownie.</translation>
         <translation>Wybierz konto do otwarcia.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>Nie zapisano hasła dla tego konta. Ustaw je w Ustawieniach, w sekcji Konta pocztowe, a następnie użyj opcji Spróbuj ponownie.</translation>
+        <translation type="vanished">Nie zapisano hasła dla tego konta. Ustaw je w Ustawieniach, w sekcji Konta pocztowe, a następnie użyj opcji Spróbuj ponownie.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Użyj opcji Odśwież, aby spróbować ponownie.</translation>
         <translation>Data niepodana</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>Ta wiadomość jest większa, niż może otworzyć ta aplikacja, więc nie można jej zaimportować.</translation>
+        <translation type="vanished">Ta wiadomość jest większa, niż może otworzyć ta aplikacja, więc nie można jej zaimportować.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>Dla tego konta nie zapisano hasła. Ustaw je w Ustawieniach, w sekcji Konta pocztowe, a następnie użyj Odśwież.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>Ta wiadomość jest zbyt duża, aby ta aplikacja mogła ją otworzyć, więc nie można jej zaimportować.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,60 +761,60 @@ Użyj opcji Odśwież, aby spróbować ponownie.</translation>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Temat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>DW</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>UDW</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -815,106 +827,104 @@ Użyj opcji Odśwież, aby spróbować ponownie.</translation>
         <translation type="vanished">Algorytm kontroli integralności wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Skrót podpisanej jednostki MIME (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Zadeklarowany skrót podpisu (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Załączniki</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Adresat szyfrowania</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Adresat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>Identyfikator klucza</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>zaszyfrowano do</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>zaszyfrowano do, nie w nagłówkach</translation>
+        <translation type="vanished">zaszyfrowano do, nie w nagłówkach</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Ukryty adresat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>nadawca nie ujawnił tego identyfikatora klucza</translation>
+        <translation type="vanished">nadawca nie ujawnił tego identyfikatora klucza</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Sprawdzanie adresata</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>SZCZEGÓŁY</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Odszyfruj</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>ADRESAT</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Podpisz</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Zweryfikuj</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>Podpisujący</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Sprawdź przed eksportem</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>Coś w tej wiadomości warto sprawdzić przed jej zapisaniem.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -945,7 +955,7 @@ EML to format pliku służący do zapisywania wiadomości e-mail, zwykle zawiera
 Po poprawieniu danych EML spróbuj ponownie wykonać operację.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -988,110 +998,173 @@ Podczas operacji e-mail wystąpił błąd. Proces nie mógł zostać ukończony.
 Jeśli problem będzie się powtarzać, rozważ skorzystanie z pomocy technicznej lub z dokumentacji.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>Bajty objęte podpisem zostały zmienione po jego utworzeniu: ich zakończenia linii nie są już CRLF. Zwykle jest to spowodowane przez program, który zmienił je podczas zapisywania lub kopiowania wiadomości. Sprawdzenie podpisu wymaga oryginalnych bajtów.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>Podpis jest prawidłowy, a klucz, który go utworzył, potwierdza adres, z którego według tej wiadomości pochodzi.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>Sam podpis jest prawidłowy, ale klucz, który go złożył, nie potwierdza adresu, z którego według tej wiadomości pochodzi. Tak wygląda podpis przeniesiony z innej wiadomości, więc warto sprawdzić, kto jest podpisującym, zanim zaufasz treści.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>Klucz, który złożył ten podpis, nie znajduje się w Twojej bazie kluczy, więc nic tutaj nie może stwierdzić, czy podpis jest autentyczny. Zaimportuj klucz nadawcy i zweryfikuj ponownie.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>Podpis został złożony kluczem, który wygasł, lub sam podpis wygasł. Może być nadal autentyczny; nie można jednak potwierdzić, że klucz był ważny w momencie jego użycia.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>Podpis nie odpowiada bajtom, które obejmuje. Albo wiadomość została zmieniona po jej podpisaniu, albo podpis nie został utworzony dla tej wiadomości.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>Nie można było ukończyć sprawdzania, więc nic nie wiadomo o tym podpisie. Nie jest to stwierdzenie, że podpis jest zły.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Ta wiadomość twierdzi, że zawiera podpis OpenPGP, ale jej struktura nie jest wystarczająco spójna, aby go sprawdzić.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Podpisy w tej wiadomości obejmują zaszyfrowane dane, a nie treść, którą czytasz. Potwierdzają, kto zaszyfrował wiadomość, ale nie mówią nic o tym, kto napisał to, co jest w środku.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>W tej wiadomości nie było podpisu do sprawdzenia.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Uwaga**: podpisana część nie jest w formie kanonicznej, ponieważ jej zakończenia linii nie są CRLF. Coś przepisało tę wiadomość po jej podpisaniu – zwykle program, który zmienił zakończenia linii podczas zapisu lub kopiowania. Podpis nie może zostać zweryfikowany względem tych bajtów, a zaimportowanie klucza nadawcy tego nie zmieni.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>Zweryfikuj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, klucz OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, nieobjęty podpisem</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>w %1, ale niezaszyfrowany do niego: nie można odczytać</translation>
+        <translation type="vanished">w %1, ale niezaszyfrowany do niego: nie można odczytać</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>Odszyfruj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>Podpisz e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>Zaszyfruj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Zaszyfruj i podpisz e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Ta wiadomość nie jest podpisana, więc nie ma podpisu do sprawdzenia. Została pomyślnie odszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Odszyfrowana zawartość nie jest wiadomością MIME, więc nie ma podpisu do sprawdzenia. Została pomyślnie odszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Ta wiadomość została odszyfrowana. Nie zawiera podpisu, więc nic tutaj nie mówi, kto ją wysłał.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Odszyfruj i zweryfikuj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Zapisz plik</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Wiadomość e-mail (*.eml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>w %1, ale nie zaszyfrowano do niego: nie mogą przeczytać tej wiadomości</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>zaszyfrowano do, ale nie wymieniono w nagłówkach</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>nadawca ukrył ten identyfikator klucza</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Nie można zapisać pliku %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 nie jest zwykłym plikiem, więc nie można go otworzyć jako wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>Plik %1 jest zbyt duży, aby go otworzyć (%2). Maksymalny dozwolony rozmiar to %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ Jeśli problem będzie się powtarzać, rozważ skorzystanie z pomocy techniczne
         <translation type="vanished">Plik %1 jest zbyt duży, aby go otworzyć (%2 bajtów). Maksymalny dozwolony rozmiar to 1 MB.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Nie można odczytać pliku %1:
@@ -1116,359 +1189,373 @@ Jeśli problem będzie się powtarzać, rozważ skorzystanie z pomocy techniczne
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>oddziel kilka adresów średnikiem &quot;;&quot;</translation>
+        <translation type="vanished">oddziel kilka adresów średnikiem &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>DW/UDW</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>DW:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>UDW:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Wyślij...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Wyślij tę wiadomość przez skonfigurowane konto pocztowe.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Wpisz tutaj swoją wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Dodaj jeden lub więcej plików do tej wiadomości. Pliki można również przeciągnąć i upuścić na wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Usuń zaznaczone załączniki z tej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Zapisz wybrane załączniki do folderu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Zapisz wszystkie załączniki do folderu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Ta wiadomość jest zaszyfrowana. Odszyfruj ją przed edycją.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Ta wiadomość jest zaszyfrowana i podpisana. Odszyfruj ją, a następnie usuń podpis przed edycją.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Surowe źródło</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Oddziel kilka adresów średnikiem &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Zabezpieczona wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Te bajty są objęte podpisem lub są szyfrogramem. Usuń podpis lub odszyfruj wiadomość przed edycją jej źródła.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Zakończ edycję</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Edytuj surowe źródło</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Edytujesz surowe źródło wiadomości. To, co tu wpisujesz, jest dokumentem.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Ta wiadomość jest zablokowana do podglądu. Nie można edytować jej źródła.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Tylko do odczytu. Odblokuj, aby bezpośrednio edytować źródło wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Ta wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Odszyfruj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Ta wiadomość jest zaszyfrowana i podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Odbiorcy nie są wymienieni w nagłówkach.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Adresowana do %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>Odbiorcy nie są wymienieni, więc nie sposób stwierdzić, czy możesz otworzyć tę wiadomość, dopóki nie spróbujesz.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>dołącz klucz publiczny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>dodaj tekst do tej wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Wiadomość zablokowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Ta wiadomość jest otwarta tylko do podglądu, więc nie można %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Odszyfruj tę wiadomość, zanim spróbujesz %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Wiadomość jest podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>To jest wersja robocza, którą wciąż piszesz, a nie odebrana wiadomość, więc nie ma tu jeszcze nic do zrobienia.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Tej wiadomości nie można edytować: jest podpisana lub zaszyfrowana, więc jest już chroniona przed zmianą.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Nie skonfigurowano jeszcze żadnego konta pocztowego. Dodaj je w Ustawieniach, w obszarze Konta pocztowe, a ta wiadomość będzie mogła zostać wysłana.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Uzupełnij, od kogo pochodzi ta wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Adres nadawcy nie wygląda na adres e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Dodaj co najmniej jednego odbiorcę.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Nadaj tej wiadomości temat.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>To nie wygląda na adres e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Zaszyfrowane</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>Nie można było sprawdzić podpisu</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Nieprawidłowa struktura OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>Nie podpisano ani nie zaszyfrowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Ta wiadomość jest zablokowana do wglądu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Szyfruj...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Szyfruj i podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Weryfikuj podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Szczegóły podpisu...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Podpisz ponownie innym kluczem...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Usuń podpis...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Odszyfruj i zweryfikuj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Szczegóły szyfrowania...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Szczegóły...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Najpierw odszyfruj tę wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Co jest nie tak z tą wiadomością?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Spróbuj mimo wszystko zweryfikować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Spróbuj mimo wszystko odszyfrować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Podpis nieosiągalny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Podpis znajduje się w zaszyfrowanej części tej wiadomości. Najpierw ją odszyfruj.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Nie ma czego usunąć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Ta wiadomość nie zawiera podpisu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>Nie można usunąć podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Ta wiadomość nie jest wystarczająco zgodna z RFC 3156, aby bezpiecznie usunąć z niej podpis. Zamiast tego edytuj surowy tekst źródłowy.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Usuń podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Podpis zostanie odrzucony, a wiadomość stanie się zwykłą, niepodpisaną. Sama wiadomość pozostanie dokładnie taka, jak jest. Tej operacji nie można cofnąć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>niepodpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>Nie można wysłać</translation>
+        <translation type="vanished">Nie można wysłać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Ta wiadomość wymaga nadawcy i co najmniej jednego odbiorcy, zanim będzie można ją wysłać.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Struktura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Bezpieczeństwo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Szczegóły wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>Nagłówki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Odbiorcy ukryci nigdy nie są zapisywani w wiadomości: nagłówek Bcc ujawniłby każdemu odbiorcy, kto otrzymał kopię ukrytą. Są oni używani do wyboru odbiorców szyfrowania i nie są zapisywani razem z plikiem.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Pokaż DW i UDW (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Pokaż wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Pokaż surowy dokument</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Odpowiedz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Napisz odpowiedź do nadawcy.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Odpowiedz wszystkim</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Napisz odpowiedź do nadawcy i wszystkich pozostałych adresatów. Odbiorcy ukryci nie są uwzględniani.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Przekaż</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Przekaż tę wiadomość wraz z załącznikami.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Tylko do odczytu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Zablokuj tę wiadomość, aby nie można było jej edytować ani modyfikować. Odpowiedź i przekazanie nadal działają i tworzą nowe wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Pokaż, co wiadomo o tej wiadomości: jej podpisy, strukturę i nagłówki.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Podpisano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Załącz plik...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Zapisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Zapisz wszystko...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Ta wiadomość jest otwarta wyłącznie do podglądu. Nie można jej edytować ani przepisać; Odpowiedz i Przekaż nadal działają i tworzą nowe wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Ta wiadomość jest podpisana. Usuń podpis przed jej edycją. Edycja pod podpisem jest odczytywana jako fałszerstwo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Ta wiadomość została napisana w HTML. Jest pokazywana jako źródło, a nie renderowana: nic tutaj nie ładuje obrazów ani nie otwiera linków.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Tylko do odczytu. Te bajty są chronione. Usuń podpis lub odszyfruj wiadomość, aby je edytować.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Nie można było przygotować tej wiadomości do podglądu, więc nie ma tu nic do pokazania. Sama wiadomość pozostaje niezmieniona.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>Nie można odpowiedzieć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>Nie można odpowiedzieć wszystkim</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>Nie można przekazać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Sama wiadomość nie została zmieniona.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>Nie można otworzyć nowej wiadomości z tego miejsca, ponieważ ten widok nie znajduje się w oknie z kartami.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Nowa wiadomość nie mogła zostać złożona. Zwykle oznacza to, że część oryginalnej wiadomości nie mogła zostać ponownie zakodowana, najczęściej załącznik.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Nie można było otworzyć karty dla nowej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>Nowa karta została otwarta, ale nie wyświetla widoku wiadomości, więc nie ma gdzie umieścić odpowiedzi. Kartę można zamknąć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>Odbiorcy nie są wymienieni, więc nie można stwierdzić, czy możesz to otworzyć, dopóki nie spróbujesz.</translation>
+        <translation type="vanished">Odbiorcy nie są wymienieni, więc nie można stwierdzić, czy możesz to otworzyć, dopóki nie spróbujesz.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Nie posiadasz klucza prywatnego dla żadnego z tych adresów. Jeśli wiadomość nie została również zaszyfrowana do klucza, który nie jest tutaj wymieniony, nie można jej otworzyć na tym komputerze.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>Posiadasz klucz prywatny dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>Posiadasz klucze prywatne dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Zaszyfrowano, podpis nie sprawdzony</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Podpis niezweryfikowany</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Zaszyfrowano, podpis zweryfikowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Podpis zweryfikowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Podpisano innym adresem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Podpis lub klucz wygasł</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Podpisano nieznanym kluczem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Nieprawidłowy podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>podpisany, niezweryfikowany</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>podpisana, nie można było sprawdzić</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>podpis nieprawidłowy</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Niektóre części znajdują się poza podpisaną sekcją tej wiadomości. Nie są objęte podpisem i mogły zostać dodane przez kogokolwiek.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>Załączniki: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Wiadomość e-mail (*.eml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>Nie można wysłać</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Załącz pliki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 to folder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 nie jest zwykłym plikiem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 jest za duży (%2); maksymalny rozmiar załącznika to %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Importuj klucz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Kopiuj nazwę</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Otwórz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Zapisz go zamiast tego i otwórz sam, jeśli masz pewność, skąd pochodzi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Nie można było utworzyć folderu tymczasowego do otwarcia %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Nie można było zapisać %1, aby go otworzyć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nic w tym systemie nie jest zarejestrowane do otwierania %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Usuń załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapisane, to jest to jedyna ich kopia. Usunięcie ich nie może być cofnięte.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>Zapisano 1 plik.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>Zapisano %1 plików.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Zapisz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>Nie można zapisać %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Zapisz załączniki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>Nie można zapisać: %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
         <translation>ważny, z problemami</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>ważny, klucz nie w pełni zaufany</translation>
+        <translation type="vanished">ważny, klucz nie w pełni zaufany</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
         <translation>Importuj klucz z tej wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Zweryfikuj podpisy</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Zweryfikuj ponownie</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Podpisy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Podpis %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>obejmuje %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>obejmuje %1, zagnieżdżone %2 poziomów</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Wynik</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>Ta sekcja jest podpisana, ale nic jeszcze jej nie zweryfikowało.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>Ta sekcja jest podpisana, ale weryfikacja nie dała wyniku: klucz podpisujący może nie znajdować się w Twojej bazie kluczy.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Nieznany podpisujący</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Inny adres</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>podpis jest prawidłowy, ale klucz należy do %1, podczas gdy ta wiadomość mówi, że pochodzi od %2. Prawidłowy podpis mówi, kto podpisał dane, a nie kto wysłał wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Algorytm klucza publicznego</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Podpisano dnia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Zadeklarowany algorytm skrótu (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Algorytm skrótu podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>Niezgodność algorytmu skrótu</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>Wiadomość deklaruje %1, ale w podpisie użyto %2</translation>
+        <translation type="vanished">Wiadomość deklaruje %1, ale w podpisie użyto %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Odbiorcy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>zaadresowano i zaszyfrowano do</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>nadawca postanowił nie zapisywać, kim jest ten odbiorca</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Ta wiadomość deklaruje użycie OpenPGP, ale jej struktura nie jest zgodna z RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>Brak dalszych informacji o tej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Klucz %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>ważny, ale klucz nie jest w pełni zaufany</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>wiadomość deklaruje %1, ale podpis użył %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>w %1, ale nie zaszyfrowano do niego: nie mogą odczytać tej wiadomości</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>zaszyfrowano do, ale nie w widocznych nagłówkach</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Ukryty odbiorca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>nadawca nie zapisał, kim jest ten odbiorca</translation>
+        <translation type="vanished">nadawca nie zapisał, kim jest ten odbiorca</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Odcisk klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>w %1, ale nie jest do niego zaszyfrowana: nie mogą tego odczytać</translation>
+        <translation type="vanished">w %1, ale nie jest do niego zaszyfrowana: nie mogą tego odczytać</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Uwaga</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>silnik podał klucz główny zamiast faktycznie użytego podklucza szyfrującego</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Klucze dla tych adresów</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>nie znaleziono klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 klucz</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 kluczy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>Klucz: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Tożsamość</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>ten adres należy do UNIEWAŻNIONEGO identyfikatora użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>ten adres jest głównym identyfikatorem użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>ten adres jest dodatkowym identyfikatorem użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>tego klucza nie można użyć do szyfrowania</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Co się wyróżnia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Ta wiadomość nie jest podpisana ani zaszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Ta wiadomość zawiera podpis.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Ta wiadomość jest zaszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Ta wiadomość jest zaszyfrowana i zawiera podpis.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Ta wiadomość deklaruje użycie OpenPGP, ale jej struktura nie jest zgodna z RFC 3156.</translation>
+        <translation type="vanished">Ta wiadomość deklaruje użycie OpenPGP, ale jej struktura nie jest zgodna z RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2397,7 +2517,7 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
         <translation>Kopia w wysłanych</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 port %2 · %3</translation>
     </message>
@@ -2418,189 +2538,189 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
         <translation>Kopiuj szczegóły</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Te adresy są przekazywane tylko serwerowi wychodzącemu. Nie pojawiają się w wiadomości, więc żaden inny odbiorca nie może ich zobaczyć.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>Nie skonfigurowano konta poczty wychodzącej.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>Nie zapisano hasła dla tego konta, więc nie można przez nie nic wysłać. Ustaw hasło w Ustawieniach, w sekcji Konta pocztowe, i włącz opcję zapamiętywania go.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Wysyłanie. To okno pokaże, co się stało.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>To konto jest skonfigurowane tylko do wysyłania, więc nie ma skrzynki, w której można przechowywać kopię.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>kopia została umieszczona w %1, ale nie można jej później odszukać: ta wiadomość nie zawiera identyfikatora Message-ID. Wiadomość wysłana dokładnie tak, jak przyszła, nigdy go nie otrzymuje, ponieważ jego dodanie zmieniłoby bajty, które mogą być objęte podpisem.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>Nie można było zidentyfikować folderu Wysłane dla tego konta.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>nie można było zapisać kopii do skrzynki pocztowej.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>nie można było zapisać kopii do skrzynki pocztowej: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Zatrzymywanie...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Nadal wysyłanie</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Ta wiadomość jest nadal wysyłana.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>Serwer mógł już ją przyjąć. Jeśli teraz zamkniesz to okno, nie dowiesz się, czy została dostarczona, a ponowne wysłanie może spowodować jej podwójne dostarczenie.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Czekaj dalej</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Zamknij mimo to</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Jeszcze nie wysłano</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Wysyłanie...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Nieznane. Połączenie zostało utracone po wysłaniu wiadomości, więc serwer mógł ją przyjąć lub nie. Sprawdź folder Wysłane lub odbiorcę przed ponownym wysłaniem: ponowne wysłanie może dostarczyć wiadomość dwukrotnie.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Tak, zaakceptowana przez serwer poczty wychodzącej</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>Nie zapisano</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Zapisywanie kopii w folderze Wysłane...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>Nie zachowano kopii.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>Wiadomość została wysłana, ale %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>Dla tego konta nie zapisano hasła, więc nie można było otworzyć jego skrzynki pocztowej.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>Nie można było uzyskać dostępu do skrzynki pocztowej.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>Nie można było uzyskać dostępu do skrzynki pocztowej: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Czeka, aż wiadomość zostanie wysłana</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Tak, Twój serwer pocztowy już zapisał ją w %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Tak, zapisano w %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Zatrzymano: nie zachowano kopii. Wiadomość mimo to została wysłana.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>Nie wiadomo, czy wiadomość została wysłana.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>Przekazano serwerowi poczty wychodzącej.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>Nie wysłano.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Zamknij (%1)</translation>
     </message>
@@ -2671,8 +2791,12 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
+        <source>Could not write %1.</source>
+        <translation>Nie można było zapisać %1.</translation>
+    </message>
+    <message>
         <source>Cannot write %1.</source>
-        <translation>Nie można zapisać %1.</translation>
+        <translation type="vanished">Nie można zapisać %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
@@ -2752,36 +2876,245 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
         <source>That message is too large to open</source>
         <translation>Ta wiadomość jest zbyt duża, aby ją otworzyć.</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>Certyfikat serwera dotyczy innego hosta.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>Certyfikat przedstawiony przez serwer nie zawiera nazwy hosta, który skonfigurowano. Tak wygląda przechwycenie, dlatego połączenie zostało odrzucone. Sprawdź, czy w nazwie hosta nie ma literówki.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>Certyfikat serwera nie jest obecnie ważny.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>Certyfikat wygasł lub nie jest jeszcze ważny. Jeśli zegar komputera jest ustawiony nieprawidłowo, najpierw go popraw; w przeciwnym razie certyfikat serwera wymaga odnowienia. Nie można tego ominąć, ufając certyfikatowi.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>Certyfikat serwera nie jest zaufany.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>Certyfikat nie został wydany przez urząd, któremu ufa Twój system. Jest to oczekiwane w przypadku serwera hostowanego samodzielnie z własnym certyfikatem. Możesz go obejrzeć i zdecydować się zaufać dokładnie temu certyfikatowi dla tego konta.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>Nie udało się odczytać certyfikatu serwera.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>Certyfikat jest typu, którego ta aplikacja nie może zweryfikować, dlatego połączenie zostało odrzucone.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>Certyfikat serwera został odrzucony.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>Nie można było zweryfikować certyfikatu, dlatego połączenie zostało odrzucone.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>Serwer odrzucił adres nadawcy.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>Serwer poczty wychodzącej nie przyjął wiadomości z tego adresu. Zwykle oznacza to, że adres nie pasuje do konta, na które się zalogowano.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>Serwer odrzucił odbiorcę</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>Serwer odrzucił odbiorcę %1</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>Wiadomość nie została wysłana do nikogo. Serwer odrzucił tego odbiorcę, a wysyłanie zatrzymuje się przy pierwszej odmowie. Popraw lub usuń adres i wyślij ponownie.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>Serwer odrzucił wiadomość</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>Serwer wychodzący zaakceptował nadawcę i odbiorców, ale odrzucił samą wiadomość. Jego odpowiedź jest pokazana poniżej i zwykle wyjaśnia dlaczego, często z powodu limitu rozmiaru lub polityki treści.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>Serwer odmówił rozpoczęcia szyfrowanego połączenia</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>Połączenie zostało zamknięte zamiast kontynuować bez szyfrowania. Sprawdź, czy ten serwer oczekuje innych ustawień zabezpieczeń lub portu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>Odmowa logowania</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>Serwer nie zaakceptował nazwy użytkownika i hasła.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>Nie można było otworzyć folderu</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>Nie można było ukończyć wyszukiwania</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>Nie można było pobrać wiadomości</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>Serwer odrzucił polecenie.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>Wynik jest nieznany.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Zatrzymano.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>Serwer przestał odpowiadać.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>Serwer nie zaakceptował nazwy użytkownika i hasła. Jeśli to konto należy do dostawcy, który wymaga logowania przez własną stronę internetową, zwykłe hasło nie zadziała i zamiast niego potrzebne będzie hasło dedykowane dla aplikacji.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>Ta wiadomość jest zbyt duża dla tego serwera.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>Serwer wysłał nieoczekiwaną odpowiedź.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>Nie udało się znaleźć serwera.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>Nie udało się rozwiązać nazwy hosta. Sprawdź, czy nie ma w niej literówki, i sprawdź, czy ten komputer jest online.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>Nie udało się połączyć z serwerem.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>Nazwa hosta została rozwiązana, ale serwer odrzucił lub zignorował połączenie. Sprawdź port i ustawienia zabezpieczeń oraz czy nie przeszkadza zapora sieciowa.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>Nie udało się nawiązać szyfrowanego połączenia.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>Serwer i ta aplikacja nie mogły uzgodnić sposobu zabezpieczenia połączenia. Serwer oferujący tylko przestarzałe szyfrowanie nie przejdzie tutaj, co jest zamierzone.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>Zachowanie nie powiodło się.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 nie rozpoczęło szyfrowanego połączenia.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>Połączenie zostało zamknięte zamiast kontynuować bez szyfrowania, więc Twoje hasło nigdy nie zostało wysłane. Sprawdź, czy ten serwer oczekuje innych ustawień zabezpieczeń lub innego portu.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>Coś poszło nie tak wewnątrz tej aplikacji.</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>Edytor poczty</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Otwórz nowy edytor tekstu do wiadomości e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>Otwórz kontroler IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>Otwórz okno dialogowe kontrolera IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>Brak konta pocztowego</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Najpierw skonfiguruj konto pocztowe z włączonym IMAP w Ustawieniach.</translation>
     </message>
@@ -2789,172 +3122,188 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>Podpisana część nie jest już w formie kanonicznej</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>Podpisana część zawiera zakończenia linii inne niż CRLF, co nie jest formą, dla której obliczany jest podpis. Coś przepisało tę wiadomość po jej podpisaniu, zwykle program, który zmienił zakończenia linii podczas zapisywania lub kopiowania, a nie atak. Podpis nie może zostać zweryfikowany względem tych bajtów, a zaimportowanie klucza nadawcy tego nie zmieni. Do sprawdzenia potrzebna jest oryginalna, niezmodyfikowana wiadomość.</translation>
+        <translation type="vanished">Podpisana część zawiera zakończenia linii inne niż CRLF, co nie jest formą, dla której obliczany jest podpis. Coś przepisało tę wiadomość po jej podpisaniu, zwykle program, który zmienił zakończenia linii podczas zapisywania lub kopiowania, a nie atak. Podpis nie może zostać zweryfikowany względem tych bajtów, a zaimportowanie klucza nadawcy tego nie zmieni. Do sprawdzenia potrzebna jest oryginalna, niezmodyfikowana wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>Zduplikowany nagłówek %1</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Ta wiadomość zawiera %1 kopii nagłówka, który może wystąpić tylko raz. Różne programy pocztowe wybierają różne kopie, więc to, co widzisz tutaj, może nie być tym, co widzi inny czytelnik.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>Adres może być zafałszowany</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>Domena w &quot;%1&quot; używa znaków, które mogą wyglądać jak inny, znajomy adres.</translation>
+        <translation type="vanished">Domena w &quot;%1&quot; używa znaków, które mogą wyglądać jak inny, znajomy adres.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Odpowiedzi trafiają gdzie indziej</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Ta wiadomość jest od &quot;%1&quot;, ale odpowiedzi byłyby wysyłane do &quot;%2&quot;, czyli innej domeny.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>Podpisana część zawiera zakończenia linii inne niż CRLF, czyli nie w takiej formie, dla której obliczono podpis. Coś przepisało tę wiadomość po jej podpisaniu, zwykle program, który zmienił zakończenia linii podczas zapisywania lub kopiowania, a nie atak. Podpis nie może zostać zweryfikowany względem tych bajtów, a zaimportowanie klucza nadawcy tego nie zmieni. Do sprawdzenia potrzebna jest oryginalna, niezmodyfikowana wiadomość.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>Domena w &quot;%1&quot; używa znaków, które mogą wyglądać jak inny, znajomy adres.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Ta wiadomość jest od &quot;%1&quot;, ale odpowiedzi byłyby wysyłane do &quot;%2&quot;, czyli innej domeny.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Nieprawidłowa sekcja podpisana</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Podpisana sekcja musi zawierać dokładnie dwie części; ta zawiera %1. Może nie zostać zweryfikowana, a to, co obejmuje, jest niejednoznaczne.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Nieprawidłowa sekcja zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Zaszyfrowana sekcja musi zawierać dokładnie dwie części; ta zawiera %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>Nie wszystko jest podpisane</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>Liczba części tej wiadomości poza podpisem: %1. Dotarły one bez uwierzytelnienia i mogły zostać dodane lub zmienione przez każdego po drodze.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>Podpis obejmuje tylko zaszyfrowane dane.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Podpis ten został złożony na zaszyfrowanym bloku, a nie na wiadomości w nim zawartej. Pokazuje, kto przesłał szyfrogram; nie mówi, kto napisał to, co czytasz, a każdy mógł podpisać kopię tego samego bloku.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Dołączono klucz publiczny</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Liczba kluczy publicznych OpenPGP w tei wiadomości: %1. Klucz dołączony do wiadomości nie dowodzi niczego o jej nadawcy: każdy może dołączyć dowolny klucz, nawet taki, który utworzył dla nazwiska z pola Od.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Dołączono odrębny podpis</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Liczba plików z podpisami: %1. Otwarcie wiadomości nie sprawdza ich; podpisują one coś innego.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>Ukryci odbiorcy są widoczni</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Liczba odbiorców wskazanych w nagłówku Bcc: %1. Każdy, kto otrzymał tę wiadomość, może zobaczyć, kto został umieszczony w ukrytej kopii.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Nic nie jest podpisane</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Ta wiadomość nie zawiera żadnego podpisu, więc odbiorca nie może stwierdzić, że pochodzi od Ciebie ani że dotarła bez zmiań.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Niektóre części nie są podpisane.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>Liczba części tej wiadomości, które zostaną wysłane bez objęcia podpisem: %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Ukryci odbiorcy</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>Ukryci odbiorcy zostaną uwzględnieni w szyfrowaniu, ale nie pojawią się w żadnym miejscu wiadomości. Liczba: %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>Obecny nagłówek Bcc</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Ta wiadomość zawiera nagłówek Bcc. Jej wysłanie ujawni każdemu odbiorcy, kto był w kopii ukrytej.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>Odbiorca może być podszyty</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
-        <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
         <translation>Domena w &quot;%1&quot; używa znaków, które mogą wyglądać jak inny adres. Sprawdź ją przed wysłaniem.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
+        <translation type="vanished">Domena w &quot;%1&quot; używa znaków, które mogą wyglądać jak inny adres. Sprawdź ją przed wysłaniem.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Brak odbiorców</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Ta wiadomość nie jest zaadresowana do nikogo.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.ru_RU.ts b/src/m_email/ts/ModuleEMail.ru_RU.ts
index b5cec93..fc5d10a 100644
--- a/src/m_email/ts/ModuleEMail.ru_RU.ts
+++ b/src/m_email/ts/ModuleEMail.ru_RU.ts
@@ -224,8 +224,12 @@ Its stored password is forgotten as well. This cannot be undone once you press O
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>Другой аккаунт уже использует этот адрес. Их нельзя различить везде, где предлагаются аккаунты.</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>Другой аккаунт уже использует этот адрес. Их нельзя различить там, где предлагаются аккаунты.</translation>
+        <translation type="vanished">Другой аккаунт уже использует этот адрес. Их нельзя различить там, где предлагаются аккаунты.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Use Refresh to try again.</source>
         <translation>Выберите учетную запись для открытия.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>Пароль для этой учетной записи не сохранен. Укажите его в настройках, в разделе «Учетные записи почты», затем нажмите «Повторить».</translation>
+        <translation type="vanished">Пароль для этой учетной записи не сохранен. Укажите его в настройках, в разделе «Учетные записи почты», затем нажмите «Повторить».</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Use Refresh to try again.</source>
         <translation>Дата не указана</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>Это сообщение больше, чем может открыть это приложение, поэтому его невозможно импортировать.</translation>
+        <translation type="vanished">Это сообщение больше, чем может открыть это приложение, поэтому его невозможно импортировать.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>Для этого аккаунта не сохранён пароль. Укажите его в Настройках, в разделе «Почтовые аккаунты», затем нажмите «Обновить».</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>Это сообщение слишком большое, чтобы открыть его в этом приложении, поэтому его невозможно импортировать.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML — это формат файла для представления эле�
 После исправления данных EML попробуйте выполнить операцию снова.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ If the issue persists, consider seeking technical support or consulting the docu
 Если проблема сохраняется, обратитесь в службу технической поддержки или ознакомьтесь с документацией.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>Электронная почта</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>Копия</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>Скрытая копия</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">Алгоритм проверки целостности сообщения</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>Дайджест подписанной MIME-сущности (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>Заявленный хэш подписи (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>Вложения</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>Получатель шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>Получатель</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>Идентификатор ключа</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>зашифровано для</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>зашифровано для, не указано в заголовках</translation>
+        <translation type="vanished">зашифровано для, не указано в заголовках</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>Скрытый получатель</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>отправитель скрыл этот идентификатор ключа</translation>
+        <translation type="vanished">отправитель скрыл этот идентификатор ключа</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>Проверка получателя</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>Расшифровать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>ПОЛУЧАТЕЛЬ</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>Подписать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>Проверить</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>ПОДПИСАНТ</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>Проверить перед экспортом</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>В этом сообщении есть что-то, что стоит проверить перед сохранением.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>Байты, охватываемые подписью, были переписаны после её создания: их переводы строк больше не являются CRLF. Обычно это вызвано программой, которая изменила их при сохранении или копировании сообщения. Для проверки подписи требуются исходные байты.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>Подпись действительна, и ключ, создавший её, подтверждает адрес, от которого отправлено это сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>Сама подпись действительна, но создавший её ключ не подтверждает адрес, от которого, как утверждается, отправлено это сообщение. Именно так выглядит подпись, перенесённая из другого сообщения, поэтому стоит проверить, кто является подписантом, прежде чем доверять содержимому.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>Ключ, создавший эту подпись, отсутствует в вашей связке ключей, поэтому здесь ничто не может подтвердить, является ли подпись подлинной. Импортируйте ключ отправителя и проверьте снова.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>Подпись была создана ключом с истёкшим сроком действия, либо истёк срок действия самой подписи. Она всё ещё может быть подлинной, но нельзя подтвердить, что ключ был действителен на момент его использования.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>Подпись не соответствует байтам, которые она охватывает. Либо сообщение было изменено после подписания, либо подпись была создана не для этого сообщения.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>Проверку не удалось завершить, поэтому об этой подписи ничего не известно. Это не означает, что подпись недействительна.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>Это сообщение заявляет о наличии подписи OpenPGP, но его структура недостаточно надёжна для её проверки.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>Подписи в этом сообщении охватывают зашифрованные данные, а не то содержимое, которое вы читаете. Они подтверждают, кто зашифровал сообщение, но ничего не говорят о том, кто написал то, что внутри него.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>В этом сообщении не было подписи для проверки.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**Примечание**: подписанная часть не находится в канонической форме, поскольку её окончания строк не являются CRLF. Что-то переписало это сообщение после его подписания; обычно это программа, которая изменила окончания строк при сохранении или копировании. Подпись не может быть проверена по этим байтам, и импорт ключа отправителя этого не изменит.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>Проверить E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>, ключ OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>, не покрыто подписью</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>в %1, но не зашифровано для него: невозможно прочитать</translation>
+        <translation type="vanished">в %1, но не зашифровано для него: невозможно прочитать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>Расшифровать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>Подписать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>Зашифровать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Зашифровать и подписать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Это сообщение не подписано, поэтому подпись для проверки отсутствует. Оно было успешно расшифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>Расшифрованное содержимое не является MIME-сообщением, поэтому подпись для проверки отсутствует. Оно было успешно расшифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>Это сообщение было расшифровано. Оно не содержит подписи, поэтому ничто здесь не указывает, кто его отправил.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Расшифровать и проверить E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Сообщение E-Mail (*.eml);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>в %1, но не зашифровано для него: они не могут прочитать это сообщение</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>Зашифровано для получателя, но не указано в заголовках.</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>отправитель скрыл этот идентификатор ключа</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Не удается записать файл %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 не является обычным файлом, поэтому его нельзя открыть как сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>Файл %1 слишком большой (%2) для открытия. Максимально допустимый размер составляет %3.</translation>
     </message>
@@ -1106,7 +1179,7 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">Файл %1 слишком большой (%2 байт) для открытия. Максимально допустимый размер составляет 1 МБ.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Не удается прочитать файл %1:
@@ -1116,359 +1189,373 @@ If the issue persists, consider seeking technical support or consulting the docu
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>разделяйте несколько адресов символом &quot;;&quot;</translation>
+        <translation type="vanished">разделяйте несколько адресов символом &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>Копия/Скрытая копия</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>Кому:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>Копия:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>Скрытая копия:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>Отправить...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Отправить это сообщение через настроенную учётную запись почты.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>Напишите ваше сообщение здесь.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Добавьте один или несколько файлов в это сообщение. Файлы также можно перетащить в сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Удалить выбранные вложения из этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Сохранить выбранные вложения в папку.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>Сохранить все вложения в папку.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Это сообщение зашифровано. Расшифруйте его перед редактированием.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Это сообщение зашифровано и подписано. Расшифруйте его, затем удалите подпись перед редактированием.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>Исходный код</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>Разделяйте несколько адресов символом &quot;;&quot;</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>Защищённое сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Эти байты покрыты подписью или являются шифротекстом. Удалите подпись или расшифруйте сообщение перед редактированием его исходного кода.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>Завершить редактирование</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>Редактировать исходный код</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Вы редактируете исходный код сообщения. Всё, что вы вводите здесь, является документом.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Это сообщение заблокировано для просмотра. Его исходный код нельзя редактировать.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Только чтение. Разблокируйте для непосредственного редактирования исходного кода сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>Это сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>Расшифровать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>Это сообщение зашифровано и подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Получатели не указаны в заголовках.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>Адресовано: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>Получатели не указаны, поэтому невозможно узнать, сможете ли вы открыть его, пока не попробуете.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>Прикрепить открытый ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>Добавить текст в это сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>Сообщение заблокировано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Это сообщение открыто только для просмотра, поэтому невозможно %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>Сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Расшифруйте это сообщение, прежде чем пытаться %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>Сообщение подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>Это черновик, который вы всё ещё пишете, а не полученное сообщение, поэтому здесь пока нет доступных действий.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>Это сообщение в любом случае нельзя редактировать: оно подписано или зашифровано, поэтому уже защищено от переписывания.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Почтовый аккаунт ещё не настроен. Добавьте его в настройках, в разделе «Почтовые аккаунты», и это сообщение можно будет отправить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>Укажите, от кого это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Адрес в поле «От» не похож на адрес электронной почты.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>Добавьте хотя бы одного получателя.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>Укажите тему этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Это не похоже на адрес электронной почты: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>Зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>Не удалось проверить подпись</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Некорректная структура OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>Не подписано и не зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>Это сообщение заблокировано для просмотра.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>Подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>Зашифровать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>Зашифровать и подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>Проверить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>Сведения о подписи...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>Подписать снова другим ключом...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>Удалить подпись...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>Расшифровать и проверить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>Сведения о шифровании...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>Подробнее...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>Сначала расшифруйте это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Что не так с этим сообщением?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>Попробовать проверить в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Попробовать расшифровать в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>Подпись недоступна</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Подпись находится внутри зашифрованной части этого сообщения. Сначала расшифруйте его.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>Нечего удалять</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>Это сообщение не содержит подписи.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>Невозможно удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Это сообщение недостаточно соответствует RFC 3156, чтобы безопасно удалить его подпись. Вместо этого отредактируйте исходный текст.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>Удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Подпись будет отброшена, и сообщение станет обычным, без подписи. Само сообщение останется без изменений. Это действие нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>без подписи</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>Не удается отправить</translation>
+        <translation type="vanished">Не удается отправить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Для отправки этого сообщения необходимы отправитель и хотя бы один получатель.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>Структура</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>Сведения о сообщении</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>Заголовки</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Скрытые получатели никогда не записываются в сообщение: заголовок Bcc сообщил бы каждому получателю, кто был в скрытой копии. Они используются для выбора получателей шифрования и не сохраняются вместе с файлом.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Показать копию и скрытую копию (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>Показать сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>Показать исходный документ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>Написать ответ отправителю.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>Ответить всем</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Написать ответ отправителю и всем, кому было адресовано письмо. Скрытые получатели не включаются.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>Переслать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Переслать это сообщение вместе с вложениями.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>Только чтение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Заблокировать это сообщение, чтобы его нельзя было редактировать или переписывать. Ответить и Переслать по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Показать, что известно об этом сообщении: его подписи, структуру и заголовки.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>Подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>Прикрепить файл...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>Сохранить...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>Сохранить все...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Это сообщение открыто только для просмотра. Его нельзя редактировать или переписывать; функции ответа и пересылки по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Это сообщение подписано. Удалите подпись перед редактированием. Правка под подписью воспринимается как подделка.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Это сообщение написано в HTML. Оно показано в виде исходного кода, а не в отрисованном виде: здесь не загружаются изображения и не открываются ссылки.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Только для чтения. Эти байты защищены. Удалите подпись или расшифруйте сообщение, чтобы редактировать их.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Это сообщение не удалось собрать для просмотра, поэтому здесь нечего показывать. Само сообщение не изменено.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>Невозможно ответить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>Невозможно ответить всем</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>Невозможно переслать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>Само сообщение не было изменено.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>Новое сообщение не может быть открыто отсюда, потому что это представление находится не в окне с вкладками.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Не удалось собрать новое сообщение. Обычно это означает, что часть исходного сообщения не удалось перекодировать, чаще всего вложение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Не удалось открыть вкладку для нового сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>Новая вкладка открылась, но в ней не отображается представление сообщения, поэтому ответ некуда поместить. Вкладку можно закрыть.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>Получатели не указаны, поэтому нельзя сказать, можно ли открыть это сообщение, пока не попробуете.</translation>
+        <translation type="vanished">Получатели не указаны, поэтому нельзя сказать, можно ли открыть это сообщение, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>У вас нет закрытого ключа ни для одного из этих адресов. Если только сообщение не было также зашифровано для ключа, который здесь не указан, его нельзя открыть на этом компьютере.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>У вас есть закрытый ключ для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>У вас есть закрытые ключи для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 Удалить подпись и сделать его обычным сообщением?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>Зашифровано, подпись не проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>Подпись не проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>Зашифровано, подпись проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>Подпись проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>Подписано другим адресом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>Срок действия подписи или ключа истёк</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>Подписано неизвестным ключом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>Недействительная подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>подписано, не проверено</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>подписано, проверить не удалось</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>подпись недействительна</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Некоторые части находятся вне подписанного раздела этого сообщения. Они не покрыты подписью и могли быть добавлены кем угодно.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 вложений</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Электронное письмо (*.eml);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>Не удается отправить</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>Прикрепить файлы</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 — это папка</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 не является обычным файлом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 слишком большой (%2); максимальный размер вложения — %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>Импортировать ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>Копировать имя</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>Открыть вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Сохраните его, а затем откройте самостоятельно, если вы уверены в его источнике.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Не удалось создать временную папку для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Не удалось записать %1 для открытия.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>В этой системе ни одна программа не зарегистрирована для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>Удалить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 Это сообщение получено откуда-то ещё, поэтому, если эти файлы ещё не сохранены, это единственная их копия. Удаление нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>Сохранён 1 файл.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>Сохранено файлов: %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>Сохранить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>Не удалось записать %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>Сохранить вложения</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>Не удалось записать: %1</translation>
     </message>
@@ -2007,9 +2102,8 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>действителен, с проблемами</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>действителен, ключ не полностью доверенный</translation>
+        <translation type="vanished">действителен, ключ не полностью доверенный</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>Импортировать ключ из этого сообщения</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>Проверить подписи</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>Проверить снова</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>Подписи</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>Подпись %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>покрывает %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>покрывает %1, вложенность: %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>Результат</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>этот раздел подписан, но ещё не проверен</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>этот раздел подписан, но проверка не дала результата: возможно, ключа подписи нет в вашей связке ключей</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>Неизвестный подписант</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>Другой адрес</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>подпись действительна, но ключ принадлежит %1, тогда как в этом сообщении указано, что оно от %2. Действительная подпись подтверждает, кто подписал байты, а не кто отправил сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>Алгоритм открытого ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>Подписано</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>Заявленный хэш (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>Хэш подписи</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>Несовпадение хэша</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>в сообщении указан %1, но в подписи использован %2</translation>
+        <translation type="vanished">в сообщении указан %1, но в подписи использован %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>Получатели</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>адресовано и зашифровано для</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>отправитель решил не указывать, кто этот получатель</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>Это сообщение заявляет об использовании OpenPGP, но его структура не соответствует RFC 3156.</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>Об этом сообщении больше нечего сообщить.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>Ключ %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>действительна, но ключ не имеет полного доверия</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>сообщение указывает %1, но в подписи использовано %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>в %1, но не зашифровано для него: они не могут прочитать это сообщение</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>зашифровано для, но не в видимых заголовках</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>Скрытый получатель</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>отправитель решил не указывать, кто это</translation>
+        <translation type="vanished">отправитель решил не указывать, кто это</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>Отпечаток</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>в %1, но не зашифровано для него: они не смогут это прочитать</translation>
+        <translation type="vanished">в %1, но не зашифровано для него: они не смогут это прочитать</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>Примечание</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>движок сообщил первичный ключ вместо фактически использованного подключа шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>Ключи для этих адресов</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>Ключ не найден</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 ключ</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 ключ(ей)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>Ключ: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>этот адрес принадлежит отозванному идентификатору пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>этот адрес является первичным идентификатором пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>этот адрес является вторичным идентификатором пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>этот ключ не может использоваться для шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>Что бросается в глаза</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>Это сообщение не подписано и не зашифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>Это сообщение содержит подпись.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>Это сообщение зашифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>Это сообщение зашифровано и содержит подпись.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>Это сообщение заявляет об использовании OpenPGP, но его структура не соответствует RFC 3156.</translation>
+        <translation type="vanished">Это сообщение заявляет об использовании OpenPGP, но его структура не соответствует RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2397,7 +2517,7 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>Копия в отправленных</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 порт %2 · %3</translation>
     </message>
@@ -2418,189 +2538,189 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>Копировать подробности</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>Эти адреса передаются только исходящему серверу. Они не отображаются в сообщении, поэтому их не видят другие получатели.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>Не настроена ни одна исходящая учетная запись.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>Для этой учетной записи не сохранен пароль, поэтому через нее нельзя отправить ни одного сообщения. Задайте пароль в Настройках, в разделе «Почтовые аккаунты», и включите параметр запоминания.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>Отправка. В этом окне будет показано, что произошло.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>Эта учётная запись настроена только для отправки, поэтому нет почтового ящика для сохранения копии.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>копия была помещена в %1, но её нельзя найти впоследствии: это сообщение не содержит Message-ID. Сообщение, отправленное точно в том виде, в котором оно поступило, никогда не получает его, потому что его добавление изменило бы байты, которые может покрывать подпись.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>Не удалось определить папку «Отправленные» для этой учётной записи.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>Не удалось записать копию в почтовый ящик.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>Не удалось записать копию в почтовый ящик: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>Остановка...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>Всё ещё отправляется</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>Это сообщение всё ещё отправляется.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>Сервер, возможно, уже принял его. Если вы закроете это окно сейчас, вы не узнаете, было ли оно доставлено, а повторная отправка может привести к его двойной доставке.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>Подождать</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>Всё равно закрыть</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>Ещё не отправлено</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>Отправка...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>Неизвестно. Соединение было потеряно после отправки сообщения, поэтому сервер мог принять его, а мог и не принять. Проверьте папку «Отправленные» или получателя, прежде чем отправлять снова: повторная отправка может доставить сообщение дважды.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>Да, принято исходящим почтовым сервером</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>Не сохранено</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>Сохранение копии в «Отправленные»...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>Копия не была сохранена.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>Сообщение было отправлено, но %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>Для этой учётной записи не сохранён пароль, поэтому не удалось открыть её почтовый ящик.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>Не удалось получить доступ к почтовому ящику.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>Не удалось получить доступ к почтовому ящику: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>Ожидает отправки сообщения</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>Да, ваш почтовый сервер уже поместил его в %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>Да, сохранено в %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>Остановлено: копия не сохранена. Сообщение всё равно было отправлено.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>Неизвестно, было ли сообщение отправлено.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>Передано на исходящий почтовый сервер.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>Не отправлено.</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>Закрыть (%1)</translation>
     </message>
@@ -2671,10 +2791,14 @@ This message came from somewhere else, so unless these have been saved already t
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
-        <source>Cannot write %1.</source>
+        <source>Could not write %1.</source>
         <translation>Не удалось записать %1.</translation>
     </message>
     <message>
+        <source>Cannot write %1.</source>
+        <translation type="vanished">Не удалось записать %1.</translation>
+    </message>
+    <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
         <translation>SHA-256 этой части: %1</translation>
@@ -2752,36 +2876,245 @@ This message came from somewhere else, so unless these have been saved already t
         <source>That message is too large to open</source>
         <translation>Это сообщение слишком большое для открытия</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>Сертификат сервера выдан для другого узла</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>Сертификат, представленный сервером, не содержит имени узла, который вы настроили. Именно так выглядит перехват, поэтому соединение было отклонено. Проверьте имя узла на опечатку.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>Сертификат сервера недействителен на данный момент</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>Срок действия сертификата истёк или ещё не наступил. Если часы на вашем компьютере настроены неверно, сначала исправьте их; в противном случае сертификат сервера следует продлить. Это нельзя обойти, просто доверившись сертификату.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>Сертификат сервера не является доверенным</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>Сертификат не был выпущен удостоверяющим центром, которому доверяет ваша система. Так и должно быть для собственного сервера с собственным сертификатом. Вы можете просмотреть его и принять решение доверять именно этому сертификату для этой учётной записи.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>Не удалось прочитать сертификат сервера</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>Сертификат имеет тип, который это приложение не может проверить, поэтому соединение было отклонено.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>Сертификат сервера был отклонён</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>Сертификат не удалось проверить, поэтому соединение было отклонено.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>Сервер отклонил адрес отправителя</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>Исходящий сервер не принимает почту с этого адреса. Обычно это означает, что адрес не соответствует учётной записи, с которой вы вошли.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>Сервер отклонил получателя.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>Сервер отклонил получателя %1.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>Сообщение не было отправлено никому. Сервер отказал этому получателю, и отправка прекращается при первом отказе. Исправьте или удалите адрес и отправьте снова.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>Сервер отклонил сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>Исходящий сервер принял отправителя и получателей, но отклонил само сообщение. Его ответ показан ниже и обычно объясняет причину, часто из-за ограничения размера или политики содержимого.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>Сервер отказался установить зашифрованное соединение.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>Соединение было закрыто, а не продолжено без шифрования. Проверьте, не ожидает ли этот сервер другие настройки безопасности или порт.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>Вход был отклонён.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>Сервер не принял имя пользователя и пароль.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>Не удалось открыть папку.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>Не удалось выполнить поиск.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>Не удалось получить сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>Сервер отклонил команду</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>Результат неизвестен</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>Остановлено</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>Сервер перестал отвечать</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>Сервер не принял имя пользователя и пароль. Если эта учётная запись принадлежит поставщику, который требует вход через собственную веб-страницу, обычный пароль не подойдёт — потребуется пароль приложения.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>Сообщение слишком большое для этого сервера</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>Сервер отправил неожиданный ответ</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>Сервер не удалось найти</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>Не удалось разрешить имя узла. Проверьте его на опечатку и убедитесь, что компьютер находится в сети.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>Сервер недоступен</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>Имя узла разрешилось, но сервер отклонил или проигнорировал подключение. Проверьте порт, параметры безопасности и наличие брандмауэра между вами и сервером.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>Не удалось установить зашифрованное соединение</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>Сервер и это приложение не смогли договориться о том, как защитить соединение. Сервер, предлагающий только устаревшее шифрование, здесь не пройдёт — это сделано намеренно.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>Операция не удалась</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 не стал устанавливать зашифрованное соединение</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>Соединение было закрыто, а не продолжено без шифрования, поэтому ваш пароль так и не был отправлен. Проверьте, не ожидает ли этот сервер другой настройки безопасности или другого порта.</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>Внутри этого приложения что-то пошло не так.</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>Редактор почты</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>Открыть новый текстовый редактор для электронной почты.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>Открыть контроллер IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>Открыть диалог контроллера IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>Нет учетной записи почты</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>Сначала настройте учетную запись почты с включенным IMAP в настройках.</translation>
     </message>
@@ -2789,172 +3122,188 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>Подписанная часть больше не в канонической форме</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>Подписанная часть содержит окончания строк, отличные от CRLF, а это не та форма, для которой вычисляется подпись. Что-то переписало это сообщение после подписания, обычно программа, которая изменила окончания строк при сохранении или копировании, а не атака. Подпись не может быть проверена для этих байтов, и импорт ключа отправителя этого не изменит. Для проверки нужно исходное, неизменённое сообщение.</translation>
+        <translation type="vanished">Подписанная часть содержит окончания строк, отличные от CRLF, а это не та форма, для которой вычисляется подпись. Что-то переписало это сообщение после подписания, обычно программа, которая изменила окончания строк при сохранении или копировании, а не атака. Подпись не может быть проверена для этих байтов, и импорт ключа отправителя этого не изменит. Для проверки нужно исходное, неизменённое сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>Повторяющийся заголовок %1</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>Это сообщение содержит %1 копий заголовка, который может встречаться только один раз. Разные почтовые программы выбирают разные копии, поэтому то, что вы видите здесь, может не совпадать с тем, что видит другой читатель.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>Адрес может быть замаскирован</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>Домен в «%1» использует символы, которые можно отобразить так, чтобы они выглядели как другой, знакомый адрес.</translation>
+        <translation type="vanished">Домен в «%1» использует символы, которые можно отобразить так, чтобы они выглядели как другой, знакомый адрес.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>Ответы уходят в другое место</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">Это сообщение от «%1», но ответы будут отправлены на «%2», а это другой домен.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>Подписанная часть содержит переводы строк, отличные от CRLF, а это не та форма, для которой вычислялась подпись. Что-то переписало сообщение после его подписания, обычно программа, изменившая переводы строк при сохранении или копировании, а не атака. Подпись не может быть проверена по этим байтам, и импорт ключа отправителя этого не изменит. Для проверки необходимо исходное, неизменённое сообщение.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>Домен в «%1» использует символы, которые можно отобразить так, чтобы они выглядели как другой, знакомый адрес.</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>Это сообщение от «%1», но ответы будут отправлены на «%2», а это другой домен.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>Некорректный подписанный раздел</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>Подписанный раздел должен содержать ровно две части; в этом разделе их %1. Подпись может не пройти проверку, и то, что она охватывает, неоднозначно.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>Некорректный зашифрованный раздел</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>Зашифрованный раздел должен содержать ровно две части; в этом разделе их %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>Не всё подписано</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>%1 часть(ей) этого сообщения находится вне подписи. Они поступили без аутентификации и могли быть добавлены или изменены кем угодно на пути.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>Подпись покрывает только зашифрованные данные</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>Эта подпись была создана по зашифрованному блоку, а не по сообщению внутри него. Она показывает, кто передал шифротекст; она не говорит, кто написал то, что вы читаете, и любой мог подписать копию этого же блока.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>Открытый ключ прикреплён</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>Это сообщение содержит %1 открытый(е) ключ(и) OpenPGP. Ключ, пришедший в сообщении, ничего не доказывает о том, кто его отправил: любой может прикрепить любой ключ, в том числе созданный для имени из строки «От».</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>Отделённая подпись прикреплена</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>Это сообщение содержит %1 файл(ов) подписи, которые не являются частью его собственной подписанной структуры. Открытие сообщения не проверяет их; они подписывают что-то другое.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>Скрытые получатели видны</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>Это сообщение содержит заголовок Bcc с указанием %1 получателя(ей). Любой, кто получил его, может видеть, кому была отправлена скрытая копия.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>Ничего не подписано</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>Это сообщение не содержит подписи, поэтому получатель не может определить, что оно исходит от вас или что оно дошло без изменений.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>Некоторые части не подписаны</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>Без подписи: %1 часть(и) этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>Скрытые получатели</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>Скрытые получатели: %1. Они будут учтены при шифровании, но не появятся в сообщении.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>Присутствует заголовок Bcc</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>Это сообщение содержит заголовок Bcc. При отправке каждый получатель узнает, кто был в скрытой копии.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>Возможна подмена получателя</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>Домен в «%1» использует символы, которые можно отобразить так, чтобы они выглядели как другой адрес. Проверьте его перед отправкой.</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>Домен в &quot;%1&quot; содержит символы, которые могут быть похожи на символы другого адреса. Проверьте адрес перед отправкой.</translation>
+        <translation type="vanished">Домен в &quot;%1&quot; содержит символы, которые могут быть похожи на символы другого адреса. Проверьте адрес перед отправкой.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>Нет получателей</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>Это сообщение никому не адресовано.</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.zh_CN.ts b/src/m_email/ts/ModuleEMail.zh_CN.ts
index 9c06879..6e3c027 100644
--- a/src/m_email/ts/ModuleEMail.zh_CN.ts
+++ b/src/m_email/ts/ModuleEMail.zh_CN.ts
@@ -224,8 +224,12 @@ Its stored password is forgotten as well. This cannot be undone once you press O
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>另一个账户已在使用此地址。无论在何处提供账户，都无法区分它们。</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>另一个账户已在使用此地址。在提供账户选择时无法区分它们。</translation>
+        <translation type="vanished">另一个账户已在使用此地址。在提供账户选择时无法区分它们。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Use Refresh to try again.</source>
         <translation>选择要打开的账户。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>此账户未存储密码。请在设置中的邮件账户下设置密码，然后使用“重试”。</translation>
+        <translation type="vanished">此账户未存储密码。请在设置中的邮件账户下设置密码，然后使用“重试”。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Use Refresh to try again.</source>
         <translation>未注明日期</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>此消息大于本应用可打开的大小，因此无法导入。</translation>
+        <translation type="vanished">此消息大于本应用可打开的大小，因此无法导入。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>此账户未存储密码。请在“设置”中的“邮件账户”下设置密码，然后使用刷新。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>此消息过大，本应用无法打开，因此无法导入。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML 是一种用于表示电子邮件的文件格式，通常包含头部、正�
 修正 EML 数据后，请重试该操作。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ If the issue persists, consider seeking technical support or consulting the docu
 如果问题仍然存在，请寻求技术支持或查阅相关文档。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>收件人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>抄送</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>密送</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">消息完整性检查算法</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>已签名 MIME 实体的摘要 (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>声明的签名哈希值 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>附件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>加密接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>密钥 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>加密至</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>加密至，未包含在邮件头中</translation>
+        <translation type="vanished">加密至，未包含在邮件头中</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>发件人未提供此密钥 ID</translation>
+        <translation type="vanished">发件人未提供此密钥 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>接收者检查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>详情</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>签名</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>验证</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>签署人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>导出前检查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>此消息中有某些内容值得在保存前检查。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>签名所覆盖的字节在签名生成后被重写：其行尾不再是 CRLF。这通常是由某个程序在保存或复制消息时更改行尾所致。要检查签名，需要使用原始字节。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>签名有效，且生成该签名的密钥能够为该消息声称的发件地址作证。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>签名本身有效，但生成该签名的密钥并不能为该消息声称的发件地址作证。这看起来就像是从另一条消息移过来的签名，因此在信任内容之前，值得检查签署人是谁。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>生成此签名的密钥不在您的密钥环中，因此这里无法判断签名是否真实。请导入发件人的密钥并重新验证。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>该签名是由已过期的密钥生成的，或者签名本身已过期。它仍可能是真实的；无法确认的是密钥在使用时是否有效。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>签名与其所覆盖的字节不匹配。要么消息在签名后被更改，要么该签名并非为此消息生成。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>检查无法完成，因此无法得知此签名的任何情况。这并不表示该签名是坏的。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>此消息声称带有 OpenPGP 签名，但其结构不足以支撑对其进行检查。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>此消息中的签名覆盖的是加密数据，而非您阅读的内容。它们确认了谁加密了消息，但并未说明谁撰写了其中的内容。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>此消息中没有可检查的签名。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**注意**：签名部分不是规范形式，因为其行尾不是 CRLF。某些程序在签名后重写了此消息，通常是保存或复制时更改行尾的程序。签名无法针对这些字节进行验证，导入发送者的密钥也不会改变这一点。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>验证电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>，一个 OpenPGP 密钥</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>，未被签名覆盖</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>在 %1 中，但未加密给它：无法读取</translation>
+        <translation type="vanished">在 %1 中，但未加密给它：无法读取</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>解密电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>签名电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>加密电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>加密并签名电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>此消息未签名，因此没有签名可检查。它已成功解密。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>解密内容不是 MIME 消息，因此没有签名可检查。它已成功解密。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>此消息已解密。它没有携带签名，因此没有任何信息表明发送者是谁。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>解密并验证电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>保存文件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>电子邮件消息 (*.eml);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>在 %1 中，但未加密给该接收者：其无法阅读此消息</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>已加密给该接收者，但未在消息头中列出</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>发送者未提供此密钥 ID</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>无法写入文件 %1：
 %2。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 不是普通文件，因此无法作为消息打开。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>文件 %1 太大（%2），无法打开。允许的最大大小为 %3。</translation>
     </message>
@@ -1106,7 +1179,7 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">文件 %1 太大（%2 字节），无法打开。允许的最大大小为 1 MB。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>无法读取文件 %1：
@@ -1116,359 +1189,373 @@ If the issue persists, consider seeking technical support or consulting the docu
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>用&quot;;&quot;分隔多个地址</translation>
+        <translation type="vanished">用&quot;;&quot;分隔多个地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>抄送/密送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>收件人:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>抄送:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>密送:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>发送...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>通过已配置的邮件账户发送此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>在此处撰写您的消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>向此消息添加一个或多个文件。也可以将文件拖放到消息上。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>从消息中移除选中的附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>将选定的附件写入文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>将所有附件写入文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>此消息已加密。编辑前请先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>此消息已加密并签名。编辑前请先解密，然后移除签名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>原始源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>用&quot;;&quot;分隔多个地址</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>受保护消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>这些字节受签名保护，或是密文。编辑其源前，请先移除签名或解密消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>停止编辑</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>编辑原始源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>您正在编辑原始消息源。您在此输入的内容就是文档。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>此消息已锁定以供检查。无法编辑其源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>只读。解锁后可直接编辑消息源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>此消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>此消息已加密并签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>邮件头中未指明接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>收件人：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>未列出接收者，因此只有尝试后才能知道您能否打开此消息。</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>附加公钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>向此消息添加文本</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>消息已锁定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>此消息仅供查看，因此无法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>请先解密此消息，再尝试%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>消息已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>这是您仍在撰写的草稿，不是已收到的邮件，因此目前没有可操作的内容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>此邮件无论如何都无法编辑：它已签名或加密，因此已受到保护，无法被重写。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>尚未设置邮件账户。请在“设置”的“邮件账户”下添加一个账户，然后即可发送此邮件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>请填写此邮件的发件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>发件人地址看起来不像电子邮件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>请至少添加一个收件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>请为此邮件填写主题。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>这看起来不像电子邮件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>无法检查签名</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>OpenPGP 结构格式错误</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>既未签名也未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>此邮件已锁定，仅供查看。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>加密并签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>验证签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>签名详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>使用另一密钥重新签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>移除签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>解密并验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>加密详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>请先解密此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>此消息有什么问题？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>仍然尝试验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>仍然尝试解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>无法获取签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>签名位于此消息的加密部分中。请先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>没有可移除的内容</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>此消息不包含签名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>无法移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>此消息未严格遵循 RFC 3156，无法安全地移除其签名。请改为编辑原始源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 签名将被丢弃，消息将变为普通的未签名消息。消息本身将保持原样。此操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>未签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>无法发送</translation>
+        <translation type="vanished">无法发送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>此消息需要发件人和至少一个接收者才能发送。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>结构</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>消息详情</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>邮件头</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 密件接收者永远不会写入消息中：Bcc 头会告诉每个接收者谁被密件抄送。它们用于选择加密接收者，并且不会随文件保存。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>显示抄送和密件抄送 (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>显示消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>显示原始文档</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>向发件人写回复。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>全部回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>向发件人及所有收件人写回复。不包括密送接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>转发</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>将此消息连同附件转发。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>只读</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>锁定此消息，使其无法编辑或重写。回复和转发仍然有效，并生成新消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>显示此消息的已知信息：其签名、结构和邮件头。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>附加文件...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>保存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>全部保存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>此消息仅供查看。无法编辑或重写；回复和转发仍然有效，并会生成新消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>此消息已签名。编辑前请移除签名。在签名下进行编辑会被视为伪造。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>此消息以 HTML 编写。显示的是其源代码而非渲染结果：此处不会加载图片或打开链接。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>只读。这些字节受保护。要编辑它们，请移除签名或解密消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>无法组装此消息以供检查，因此这里没有可显示的内容。消息本身未更改。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>无法回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>无法全部回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>无法转发</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>此消息本身未更改。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>无法从此处打开新消息，因为此视图不在包含标签页的窗口中。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>无法组装新消息。这通常意味着原始消息的某个部分无法重新编码，最常见的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>无法为新消息打开标签页。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>新标签页已打开，但未显示消息视图，因此无处放置回复。可以关闭该标签页。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>未列出接收者，因此能否打开此消息只有尝试后才能知道。</translation>
+        <translation type="vanished">未列出接收者，因此能否打开此消息只有尝试后才能知道。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>您不持有这些地址中任何一个的私钥。除非消息还加密到了此处未列出的密钥，否则无法在这台计算机上打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>您持有 %1 的私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>您持有 %1 的多个私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 是否移除签名并将其变为普通消息？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>已加密，未检查签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>签名未检查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>已加密，签名已验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>签名已验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>由不同的地址签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>签名或密钥已过期</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>由未知密钥签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>签名无效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>已签名，未检查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>已签名，无法检查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>签名不正确</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>此消息的某些部分位于签名部分之外。它们不受签名保护，任何人都可能添加。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>电子邮件 (*.eml);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>无法发送</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>添加附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 是一个文件夹</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 不是普通文件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 太大（%2）；最多可附加 %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>导入密钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>复制名称</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>打开附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 请改为保存它，如果您确定其来源，再自行打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>无法创建用于打开 %1 的临时文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>无法写出 %1 以将其打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>此系统上没有注册可打开 %1 的程序。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 这封邮件来自其他地方，因此除非这些文件已保存，否则这是唯一的副本。移除操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>已保存 1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>已保存 %1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>无法写入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>无法写入：%1</translation>
     </message>
@@ -2007,9 +2102,8 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>有效，但存在问题</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>有效，密钥未完全信任</translation>
+        <translation type="vanished">有效，密钥未完全信任</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>导入此消息中的密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>验证签名</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>重新验证</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>签名</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>签名 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>涵盖 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>涵盖 %1，嵌套 %2 层</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>结果</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>此部分已签名，但尚未验证</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>此部分已签名，但验证未产生结果：签名密钥可能不在您的密钥环中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>未知签署人</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>地址不同</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>签名有效，但密钥属于 %1，而此消息声称来自 %2。有效签名说明的是谁签署了字节，而不是谁发送了消息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>公钥算法</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>签名时间</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>声明哈希 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>签名哈希</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>哈希不匹配</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>消息声明为 %1，但签名使用了 %2</translation>
+        <translation type="vanished">消息声明为 %1，但签名使用了 %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>收件人为并加密给</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>发件人选择不记录此接收者的身份</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>此消息声称使用 OpenPGP，但其结构不符合 RFC 3156。</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>关于此消息没有更多可报告的信息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>密钥 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>有效，但密钥未被完全信任</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>消息声称使用 %1，但签名使用的是 %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>位于 %1 中，但未加密至其：他们无法阅读此消息</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>已加密给，但不在可见邮件头中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>发件人选择不记录其身份</translation>
+        <translation type="vanished">发件人选择不记录其身份</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>指纹</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>在 %1 中，但未对其加密：他们无法读取</translation>
+        <translation type="vanished">在 %1 中，但未对其加密：他们无法读取</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>引擎报告的是主密钥，而非实际使用的加密子密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>这些地址对应的密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>未找到密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 个密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 个密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>密钥为 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>身份</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>此地址位于该密钥的已吊销用户 ID 上</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>此地址是密钥的主用户 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>此地址是密钥的次要用户 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>此密钥不能用于加密</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>突出之处</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>此消息既未签名也未加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>此消息带有签名。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>此消息已加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>此消息已加密并带有签名。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>此消息声称使用 OpenPGP，但其结构不符合 RFC 3156。</translation>
+        <translation type="vanished">此消息声称使用 OpenPGP，但其结构不符合 RFC 3156。</translation>
     </message>
 </context>
 <context>
@@ -2393,7 +2513,7 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>在已发送中保存副本</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 端口 %2 · %3</translation>
     </message>
@@ -2414,189 +2534,189 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>复制详细信息</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>这些地址仅提供给外发服务器。它们不会显示在邮件中，因此其他接收者无法看到。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>发送</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>未配置外发账户。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>此账户未存储密码，因此无法通过它发送任何内容。请在设置中的“邮件账户”下设置密码，并开启记住密码的选项。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>正在发送。此窗口将显示发送结果。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>此账户仅用于发送，因此没有可保存副本的邮箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>副本已放入 %1，但之后无法查找：此消息没有 Message-ID。完全按原样发送的消息不会获得 Message-ID，因为添加它会改变可能被签名覆盖的字节。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>无法为此账户识别“已发送”文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>无法将副本写入邮箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>无法将副本写入邮箱：%1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>正在停止...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>仍在发送</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>此消息仍在发送中。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>服务器可能已接受该消息。如果现在关闭此窗口，您将无法得知是否送达，而重新发送可能会导致重复投递。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>继续等待</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>仍然关闭</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>尚未发送</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>正在发送...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>未知。消息发送后连接已丢失，因此服务器可能已接受，也可能未接受。再次发送前请检查“已发送”文件夹或接收者：重新发送可能导致投递两次。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>是，外发邮件服务器已接受</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>未保存</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>正在将副本保存到“已发送”...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>未保留副本。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>消息已发送，但 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>此账户未存储密码，因此无法打开其邮箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>无法访问邮箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>无法访问邮箱：%1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>等待消息发送完成</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>是的，您的邮件服务器已将邮件归档到 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>是的，已保存到 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>已停止：未保留副本，但邮件仍已发送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>无法确认该邮件是否已发送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>已交给外发邮件服务器。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>未发送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>关闭 (%1)</translation>
     </message>
@@ -2667,10 +2787,14 @@ This message came from somewhere else, so unless these have been saved already t
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
-        <source>Cannot write %1.</source>
+        <source>Could not write %1.</source>
         <translation>无法写入 %1。</translation>
     </message>
     <message>
+        <source>Cannot write %1.</source>
+        <translation type="vanished">无法写入 %1。</translation>
+    </message>
+    <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
         <translation>此部分的 SHA-256：%1</translation>
@@ -2748,36 +2872,245 @@ This message came from somewhere else, so unless these have been saved already t
         <source>That message is too large to open</source>
         <translation>该邮件太大，无法打开。</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>服务器的证书适用于其他主机。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>服务器提供的证书未包含您配置的主机名。这看起来像是中间人攻击，因此连接被拒绝。请检查主机名是否有拼写错误。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>服务器证书当前无效。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>该证书已过期或尚未生效。如果您的计算机时钟有误，请先修正；否则服务器证书需要续期。信任该证书也无法绕过此问题。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>服务器证书不受信任。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>该证书并非由您系统信任的机构签发。对于自带证书的自托管服务器，这属于正常情况。您可以检查它，并选择为该账户信任这一确保证书。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>无法读取服务器证书。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>该证书的类型是本应用无法验证的，因此连接被拒绝。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>服务器的证书已被拒绝。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>无法验证该证书，因此连接被拒绝。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>服务器拒绝了发件人地址。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>发送服务器不接受来自此地址的邮件。这通常意味着该地址与您登录的账户不匹配。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>服务器拒绝了一位接收者。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>服务器拒绝了该接收者 %1。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>该邮件未发送给任何人。服务器拒绝了该接收者，发送在第一次拒绝时停止。请更正或删除该地址后重新发送。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>服务器拒绝了该邮件。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>外发服务器接受了发件人和接收者，但拒绝了邮件本身。其回复显示在下方，通常会解释原因，常见原因是大小限制或内容策略。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>服务器拒绝启动加密连接。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>连接被关闭，而不是继续以非加密方式传输。请检查此服务器是否要求不同的安全设置或端口。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>登录被拒绝。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>服务器未接受用户名和密码。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>无法打开文件夹。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>无法完成搜索。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>无法获取该邮件。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>服务器拒绝了命令。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>结果未知。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>已停止。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>服务器停止响应。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>服务器未接受用户名和密码。如果此账户属于需要通过自己的网页登录的提供商，普通密码将无法使用，您需要使用应用专用密码。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>该邮件对此服务器来说过大。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>服务器发送了意外的响应。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>找不到服务器。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>主机名无法解析。请检查是否有拼写错误，并确认此计算机已联网。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>无法连接到服务器。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>主机名已解析，但连接被拒绝或忽略。请检查端口和安全设置，以及是否存在防火墙拦截。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>无法建立加密连接。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>服务器和此应用程序无法就如何确保连接安全达成一致。仅提供过旧加密的服务器将在此失败，这是有意为之。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>操作失败</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 不会启动加密连接。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>连接被关闭而不是继续未加密，因此您的密码从未被发送。请检查此服务器是否需要不同的安全设置或端口。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>此应用程序内部发生错误。</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>邮件编辑器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>打开新的电子邮件文本编辑器。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>打开 IMAP 控制器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>打开 IMAP 控制器对话框</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>没有邮件账户</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>请先在设置中配置启用 IMAP 的邮件账户。</translation>
     </message>
@@ -2785,172 +3118,188 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>签名部分不再符合规范形式</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>签名部分包含的行结尾不是 CRLF，这不是计算签名时所依据的形式。此消息在签名后被某些程序重写，通常是某个程序在保存或复制时更改了行结尾，而非攻击。签名无法针对这些字节验证，导入发送者的密钥也不会改变这一点。要检查它，需要原始未修改的消息。</translation>
+        <translation type="vanished">签名部分包含的行结尾不是 CRLF，这不是计算签名时所依据的形式。此消息在签名后被某些程序重写，通常是某个程序在保存或复制时更改了行结尾，而非攻击。签名无法针对这些字节验证，导入发送者的密钥也不会改变这一点。要检查它，需要原始未修改的消息。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>重复的 %1 标头</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>此消息携带了 %1 份只能出现一次的标头。不同的邮件程序会选择不同的副本，因此您在这里看到的内容可能与其他读者看到的不同。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>地址可能被伪装</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>&quot;%1&quot; 中的域名使用了可被绘制成看似另一个熟悉地址的字符。</translation>
+        <translation type="vanished">&quot;%1&quot; 中的域名使用了可被绘制成看似另一个熟悉地址的字符。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>回复发往别处</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
-        <translation>此消息来自 &quot;%1&quot;，但回复将发送到 &quot;%2&quot;，这是不同的域名。</translation>
+        <translation type="vanished">此消息来自 &quot;%1&quot;，但回复将发送到 &quot;%2&quot;，这是不同的域名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>签名部分包含的行结尾不是 CRLF，这不是签名计算所采用的形式。消息在签名后被重写，通常是某个程序在保存或复制时改变了行结尾，并非攻击。签名无法根据这些字节验证，导入发件人的密钥也不会改变这一点。要验证它，需要原始未修改的消息。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>“%1”中的域名使用了可被绘制成另一个熟悉地址的字符。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation>此消息来自 “%1”，但回复将发送到 “%2”，这是不同的域名。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>签名部分格式错误</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>签名部分必须恰好包含两个部分；此部分包含 %1 个。它可能无法验证，且其覆盖范围不明确。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>加密部分格式错误</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>加密部分必须恰好包含两个部分；此部分包含 %1 个。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>并非所有内容都已签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>此消息的 %1 个部分位于签名之外。它们未经认证到达，路径上的任何人都可能添加或更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>签名仅覆盖加密数据</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>此签名是针对加密块生成的，而非针对其内部的消息。它表明谁发送了密文，但不能说明谁编写了你正在阅读的内容；任何人都可能对同一加密块的副本进行签名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>附带公钥</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>此消息带有 %1 个 OpenPGP 公钥。消息中附带的密钥不能证明其发送者身份：任何人都可以附加任何密钥，包括他们为发件人行上的名称所创建的密钥。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>附带分离式签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>此消息带有 %1 个签名文件，这些文件不属于其自身签名结构的一部分。打开消息不会检查这些文件；它们为其他内容签名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>密件抄送接收者可见</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>此消息带有 Bcc 标头，列出了 %1 个接收者。任何收到此消息的人都可以看到谁被密送。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>未签名任何内容</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>此消息没有签名，因此接收者无法判断它是否来自您，也无法判断其是否未被更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>部分内容未签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>此消息的 %1 个部分将在没有签名覆盖的情况下发出。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>%1 个隐藏接收者将包含在加密中，但不会出现在消息的任何位置。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>存在 Bcc 标头</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>此消息带有 Bcc 标头。发送它会告诉每个接收者谁被密送。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>接收者可能被伪装</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>“%1”中的域名使用了可被绘制成另一个地址的字符。发送前请检查。</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>“%1”中的域名使用了可被伪装成其他地址的字符。发送前请检查。</translation>
+        <translation type="vanished">“%1”中的域名使用了可被伪装成其他地址的字符。发送前请检查。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>无接收者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>此消息未指定任何接收者。</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.zh_TW.ts b/src/m_email/ts/ModuleEMail.zh_TW.ts
index e35e360..1a28acd 100644
--- a/src/m_email/ts/ModuleEMail.zh_TW.ts
+++ b/src/m_email/ts/ModuleEMail.zh_TW.ts
@@ -224,8 +224,12 @@ Its stored password is forgotten as well. This cannot be undone once you press O
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="709"/>
+        <source>Another account already uses this address. They cannot be told apart wherever accounts are offered.</source>
+        <translation>另一個帳戶已使用此地址。無論在哪裡提供帳戶，都無法區分它們。</translation>
+    </message>
+    <message>
         <source>Another account already uses this address. They cannot be told apart where accounts are offered.</source>
-        <translation>另一個帳戶已使用此地址。在提供帳戶的地方將無法區分它們。</translation>
+        <translation type="vanished">另一個帳戶已使用此地址。在提供帳戶的地方將無法區分它們。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
@@ -522,9 +526,8 @@ Use Refresh to try again.</source>
         <translation>選擇要開啟的帳戶。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="698"/>
         <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Try Again.</source>
-        <translation>此帳戶未儲存密碼。請在「設定」的「郵件帳戶」中設定密碼，然後使用「重試」。</translation>
+        <translation type="vanished">此帳戶未儲存密碼。請在「設定」的「郵件帳戶」中設定密碼，然後使用「重試」。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
@@ -558,9 +561,18 @@ Use Refresh to try again.</source>
         <translation>未註明日期</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="961"/>
         <source>This message is larger than this application will open, so it cannot be imported.</source>
-        <translation>此郵件超過本應用程式可開啟的大小，因此無法匯入。</translation>
+        <translation type="vanished">此郵件超過本應用程式可開啟的大小，因此無法匯入。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="698"/>
+        <source>No password is stored for this account. Set one in Settings, under Mail Accounts, then use Refresh.</source>
+        <translation>此帳戶未儲存密碼。請在設定中的郵件帳戶下設定密碼，然後使用重新整理。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapController.cpp" line="961"/>
+        <source>This message is too large for this application to open, so it cannot be imported.</source>
+        <translation>此郵件過大，本應用程式無法開啟，因此無法匯入。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
@@ -749,7 +761,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="558"/>
+        <location filename="../EMailModule.cpp" line="569"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -780,7 +792,7 @@ EML 是一種用於表示電子郵件訊息的檔案格式，通常包含標頭�
 修正 EML 資料後，請再次嘗試操作。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="583"/>
+        <location filename="../EMailModule.cpp" line="594"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -823,60 +835,60 @@ If the issue persists, consider seeking technical support or consulting the docu
 若問題持續發生，請尋求技術支援或查閱文件。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1773"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="978"/>
+        <location filename="../EMailModule.cpp" line="1143"/>
+        <location filename="../EMailModule.cpp" line="1866"/>
         <source>From</source>
         <translation>寄件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
+        <location filename="../EMailModule.cpp" line="107"/>
         <source>E-Mail</source>
         <translation>電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="891"/>
-        <location filename="../EMailModule.cpp" line="1050"/>
-        <location filename="../EMailModule.cpp" line="1776"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="981"/>
+        <location filename="../EMailModule.cpp" line="1146"/>
+        <location filename="../EMailModule.cpp" line="1869"/>
         <source>To</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="895"/>
-        <location filename="../EMailModule.cpp" line="1054"/>
-        <location filename="../EMailModule.cpp" line="1780"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="985"/>
+        <location filename="../EMailModule.cpp" line="1150"/>
+        <location filename="../EMailModule.cpp" line="1873"/>
         <source>Subject</source>
         <translation>主旨</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="898"/>
-        <location filename="../EMailModule.cpp" line="1057"/>
-        <location filename="../EMailModule.cpp" line="1783"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="988"/>
+        <location filename="../EMailModule.cpp" line="1153"/>
+        <location filename="../EMailModule.cpp" line="1876"/>
         <source>CC</source>
         <translation>副本</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="111"/>
-        <location filename="../EMailModule.cpp" line="901"/>
-        <location filename="../EMailModule.cpp" line="1060"/>
-        <location filename="../EMailModule.cpp" line="1786"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="991"/>
+        <location filename="../EMailModule.cpp" line="1156"/>
+        <location filename="../EMailModule.cpp" line="1879"/>
         <source>BCC</source>
         <translation>密件副本</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="112"/>
-        <location filename="../EMailModule.cpp" line="904"/>
-        <location filename="../EMailModule.cpp" line="1063"/>
-        <location filename="../EMailModule.cpp" line="1789"/>
+        <location filename="../EMailModule.cpp" line="113"/>
+        <location filename="../EMailModule.cpp" line="994"/>
+        <location filename="../EMailModule.cpp" line="1159"/>
+        <location filename="../EMailModule.cpp" line="1882"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="119"/>
+        <location filename="../EMailModule.cpp" line="120"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -889,209 +901,270 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">訊息完整性檢查演算法</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="123"/>
-        <location filename="../EMailModule.cpp" line="913"/>
-        <location filename="../EMailModule.cpp" line="1808"/>
+        <location filename="../EMailModule.cpp" line="124"/>
+        <location filename="../EMailModule.cpp" line="1003"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation>已簽署 MIME 實體摘要 (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="126"/>
-        <location filename="../EMailModule.cpp" line="918"/>
-        <location filename="../EMailModule.cpp" line="1813"/>
+        <location filename="../EMailModule.cpp" line="127"/>
+        <location filename="../EMailModule.cpp" line="1008"/>
+        <location filename="../EMailModule.cpp" line="1906"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation>宣告的簽章雜湊值 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="162"/>
+        <location filename="../EMailModule.cpp" line="163"/>
         <source>Attachments</source>
         <translation>附件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Encryption Recipient</source>
         <translation>加密收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Recipient</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="229"/>
+        <location filename="../EMailModule.cpp" line="230"/>
         <source>Key ID</source>
         <translation>金鑰 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="283"/>
+        <location filename="../EMailModule.cpp" line="284"/>
         <source>encrypted to</source>
         <translation>加密至</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation>加密至（不在標頭中）</translation>
+        <translation type="vanished">加密至（不在標頭中）</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="304"/>
         <source>Hidden recipient</source>
         <translation>隱藏收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation>寄件者未提供此金鑰 ID</translation>
+        <translation type="vanished">寄件者未提供此金鑰 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="309"/>
+        <location filename="../EMailModule.cpp" line="313"/>
         <source>Recipient Check</source>
         <translation>收件者檢查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>DETAILS</source>
         <translation>詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="358"/>
+        <location filename="../EMailModule.cpp" line="363"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="360"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>RECIPIENT</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="362"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>Sign</source>
         <translation>簽署</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="365"/>
+        <location filename="../EMailModule.cpp" line="370"/>
         <source>Verify</source>
         <translation>驗證</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="367"/>
+        <location filename="../EMailModule.cpp" line="372"/>
         <source>SIGNER</source>
         <translation>簽署者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="523"/>
+        <location filename="../EMailModule.cpp" line="534"/>
         <source>Check before exporting</source>
         <translation>匯出前檢查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="524"/>
+        <location filename="../EMailModule.cpp" line="535"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation>此訊息在儲存前有值得檢查的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="926"/>
-        <location filename="../EMailModule.cpp" line="1822"/>
+        <location filename="../EMailModule.cpp" line="864"/>
+        <source> The bytes the signature covers were rewritten after it was made: their line endings are no longer CRLF. This is usually caused by a program that changed them while saving or copying the message. Checking the signature requires the original bytes.</source>
+        <translation>簽章所涵蓋的位元組在簽章建立後遭到改寫：其行結尾不再是 CRLF。這通常是由程式在儲存或複製訊息時變更行結尾所致。檢查簽章需要原始位元組。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="875"/>
+        <source>The signature is valid, and the key that made it speaks for the address this message says it is from.</source>
+        <translation>簽章有效，且產生簽章的金鑰為此訊息所聲稱的寄件地址背書。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="881"/>
+        <source>The signature itself is valid, but the key that made it does not speak for the address this message says it is from. That is what a signature moved from another message looks like, so it is worth checking who the signer is before trusting the contents.</source>
+        <translation>簽章本身有效，但產生簽章的金鑰並不為此訊息所聲稱的寄件地址背書。這看起來就像從另一則訊息搬移過來的簽章，因此在信任內容之前，值得先檢查簽署者是誰。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="889"/>
+        <source>The key that made this signature is not in your keyring, so nothing here can say whether the signature is genuine. Import the sender&apos;s key and verify again.</source>
+        <translation>產生此簽章的金鑰不在您的金鑰環中，因此這裡無法判斷簽章是否真實。請匯入寄件者的金鑰並重新驗證。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="896"/>
+        <source>The signature was made with a key that has expired, or the signature itself has. It may still be genuine; what cannot be confirmed is that the key was valid at the time it was used.</source>
+        <translation>此簽章是由已過期的金鑰所產生，或簽章本身已過期。它仍可能是真實的；無法確認的是金鑰在使用時是否有效。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="903"/>
+        <source>The signature does not match the bytes it covers. Either the message was changed after it was signed, or the signature was not made for this message.</source>
+        <translation>簽章與其所涵蓋的位元組不符。可能是訊息在簽署後遭到變更，或此簽章並非為這則訊息所產生。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="911"/>
+        <source>The check could not be completed, so nothing is known about this signature either way. This is not a statement that the signature is bad.</source>
+        <translation>檢查無法完成，因此對這個簽章的好壞一無所知。這並非表示簽章無效。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="919"/>
+        <source>This message claims to carry an OpenPGP signature, but its structure does not hold up well enough to check one.</source>
+        <translation>此訊息聲稱帶有 OpenPGP 簽章，但其結構不足以進行檢查。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="925"/>
+        <source>The signatures in this message cover the encrypted data rather than the content you read. They confirm who encrypted the message, but say nothing about who wrote what is inside it.</source>
+        <translation>此訊息中的簽章涵蓋的是加密資料，而非您所閱讀的內容。它們只能確認誰加密了訊息，但無法說明內部內容的作者是誰。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="936"/>
+        <source>There was no signature in this message to check.</source>
+        <translation>此訊息中沒有可供檢查的簽章。</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1016"/>
+        <location filename="../EMailModule.cpp" line="1915"/>
         <source>**Note**: the signed part is not in canonical form, because its line endings are not CRLF. Something rewrote this message after it was signed, which is usually a program that changed line endings while saving or copying it. A signature cannot verify against these bytes, and importing the sender&apos;s key will not change that.</source>
         <translation>**注意**：簽署的部分並非規範形式，因為其行結尾不是 CRLF。此訊息在簽署後曾被重寫，通常是某個程式在儲存或複製時變更了行結尾。簽章無法針對這些位元組進行驗證，匯入寄件者的金鑰也不會改變這一點。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="848"/>
-        <location filename="../EMailModule.cpp" line="942"/>
+        <location filename="../EMailModule.cpp" line="1032"/>
         <source>Verify E-Mail</source>
         <translation>驗證電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="152"/>
+        <location filename="../EMailModule.cpp" line="153"/>
         <source>, an OpenPGP key</source>
         <translation>，一個 OpenPGP 金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="155"/>
+        <location filename="../EMailModule.cpp" line="156"/>
         <source>, not covered by the signature</source>
         <translation>，未受簽章涵蓋</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation>在 %1 中，但未加密給它：無法讀取</translation>
+        <translation type="vanished">在 %1 中，但未加密給它：無法讀取</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1002"/>
-        <location filename="../EMailModule.cpp" line="1077"/>
+        <location filename="../EMailModule.cpp" line="1098"/>
+        <location filename="../EMailModule.cpp" line="1173"/>
         <source>Decrypt E-Mail</source>
         <translation>解密電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1145"/>
-        <location filename="../EMailModule.cpp" line="1210"/>
-        <location filename="../EMailModule.cpp" line="1266"/>
-        <location filename="../EMailModule.cpp" line="1294"/>
+        <location filename="../EMailModule.cpp" line="1241"/>
+        <location filename="../EMailModule.cpp" line="1306"/>
+        <location filename="../EMailModule.cpp" line="1362"/>
+        <location filename="../EMailModule.cpp" line="1390"/>
         <source>Sign E-Mail</source>
         <translation>簽署電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1347"/>
-        <location filename="../EMailModule.cpp" line="1415"/>
-        <location filename="../EMailModule.cpp" line="1460"/>
-        <location filename="../EMailModule.cpp" line="1490"/>
+        <location filename="../EMailModule.cpp" line="1443"/>
+        <location filename="../EMailModule.cpp" line="1511"/>
+        <location filename="../EMailModule.cpp" line="1556"/>
+        <location filename="../EMailModule.cpp" line="1586"/>
         <source>Encrypt E-Mail</source>
         <translation>加密電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1632"/>
-        <location filename="../EMailModule.cpp" line="1665"/>
+        <location filename="../EMailModule.cpp" line="1728"/>
+        <location filename="../EMailModule.cpp" line="1761"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>加密並簽署電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1703"/>
+        <location filename="../EMailModule.cpp" line="1800"/>
         <source>This message is not signed, so there is no signature to check. It was decrypted successfully.</source>
         <translation>此訊息未簽署，因此沒有簽章可檢查。已成功解密。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1707"/>
+        <location filename="../EMailModule.cpp" line="1804"/>
         <source>The decrypted content is not a MIME message, so there is no signature to check. It was decrypted successfully.</source>
         <translation>解密內容不是 MIME 訊息，因此沒有簽章可檢查。已成功解密。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1801"/>
+        <location filename="../EMailModule.cpp" line="1894"/>
         <source>This message was decrypted. It carries no signature, so nothing here says who sent it.</source>
         <translation>此訊息已解密。它未帶有簽章，因此這裡沒有任何資訊能指出寄件者是誰。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1843"/>
+        <location filename="../EMailModule.cpp" line="1939"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>解密並驗證電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1901"/>
+        <location filename="../EMailModule.cpp" line="1998"/>
         <source>Save file</source>
         <translation>儲存檔案</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1903"/>
+        <location filename="../EMailModule.cpp" line="2000"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>電子郵件訊息 (*.eml);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="501"/>
+        <location filename="../EMailModule.cpp" line="512"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1968"/>
-        <location filename="../EMailModule.cpp" line="1980"/>
+        <location filename="../EMailModule.cpp" line="290"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>在 %1 中，但未加密給該收件者：對方無法讀取此訊息</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="298"/>
+        <source>encrypted to, but not listed in the headers</source>
+        <translation>已加密給該收件者，但未列於標頭中</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="305"/>
+        <source>the sender withheld this key ID</source>
+        <translation>寄件者隱藏了此金鑰 ID</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="2065"/>
+        <location filename="../EMailModule.cpp" line="2077"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>無法寫入檔案 %1：
 %2。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2023"/>
+        <location filename="../EMailModule.cpp" line="2120"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
         <translation>%1 不是一般檔案，因此無法作為訊息開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2033"/>
+        <location filename="../EMailModule.cpp" line="2130"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
         <translation>檔案 %1 太大（%2），無法開啟。允許的最大容量為 %3。</translation>
     </message>
@@ -1106,7 +1179,7 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">檔案 %1 太大（%2 位元組），無法開啟。允許的最大容量為 1 MB。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="2044"/>
+        <location filename="../EMailModule.cpp" line="2141"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>無法讀取檔案 %1：
@@ -1116,359 +1189,373 @@ If the issue persists, consider seeking technical support or consulting the docu
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation>以「;」分隔多個地址</translation>
+        <translation type="vanished">以「;」分隔多個地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="543"/>
+        <location filename="../EMailPageView.cpp" line="542"/>
         <source>From:</source>
         <translation>寄件者:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="556"/>
+        <location filename="../EMailPageView.cpp" line="555"/>
         <source>Cc/Bcc</source>
         <translation>副本/密件副本</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="565"/>
+        <location filename="../EMailPageView.cpp" line="564"/>
         <source>To:</source>
         <translation>收件者:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="566"/>
+        <location filename="../EMailPageView.cpp" line="565"/>
         <source>Cc:</source>
         <translation>副本:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="567"/>
+        <location filename="../EMailPageView.cpp" line="566"/>
         <source>Bcc:</source>
         <translation>密件副本:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="578"/>
+        <location filename="../EMailPageView.cpp" line="577"/>
         <source>Subject:</source>
         <translation>主旨:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="711"/>
+        <location filename="../EMailPageView.cpp" line="710"/>
         <source>Send...</source>
         <translation>傳送...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="712"/>
+        <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send this message through a configured mail account.</source>
         <translation>透過已設定的郵件帳號傳送此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="789"/>
-        <location filename="../EMailPageView.cpp" line="1266"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
+        <location filename="../EMailPageView.cpp" line="1270"/>
         <source>Write your message here.</source>
         <translation>在此輸入您的訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="908"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>將一或多個檔案新增至此訊息。也可以將檔案拖曳到訊息上。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="916"/>
+        <location filename="../EMailPageView.cpp" line="915"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>將選取的附件從此訊息中移除。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="919"/>
+        <location filename="../EMailPageView.cpp" line="918"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>將選取的附件寫入資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Write every attachment to a folder.</source>
         <translation>將所有附件寫入資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1177"/>
+        <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>此訊息已加密。編輯前請先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1181"/>
+        <location filename="../EMailPageView.cpp" line="1185"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>此訊息已加密並簽署。編輯前請先解密，然後移除簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Raw Source</source>
         <translation>原始來源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1495"/>
+        <location filename="../EMailPageView.cpp" line="517"/>
+        <source>Separate several addresses with &quot;;&quot;</source>
+        <translation>以 &quot;;&quot; 分隔多個地址</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1498"/>
         <source>Protected Message</source>
         <translation>受保護的訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1496"/>
+        <location filename="../EMailPageView.cpp" line="1499"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>這些位元組受簽章保護，或為密文。編輯其來源前，請先移除簽章或解密訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1518"/>
+        <location filename="../EMailPageView.cpp" line="1521"/>
         <source>Stop Editing</source>
         <translation>停止編輯</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1519"/>
+        <location filename="../EMailPageView.cpp" line="1522"/>
         <source>Edit Raw Source</source>
         <translation>編輯原始來源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1525"/>
+        <location filename="../EMailPageView.cpp" line="1528"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>您正在編輯原始訊息來源。您在此輸入的內容即為文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1532"/>
+        <location filename="../EMailPageView.cpp" line="1535"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>此訊息已鎖定以供檢視。其來源無法編輯。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1541"/>
+        <location filename="../EMailPageView.cpp" line="1544"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>唯讀。解鎖後即可直接編輯訊息來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1787"/>
-        <location filename="../EMailPageView.cpp" line="1836"/>
+        <location filename="../EMailPageView.cpp" line="1823"/>
+        <location filename="../EMailPageView.cpp" line="1872"/>
         <source>This message is encrypted</source>
         <translation>此郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1815"/>
-        <location filename="../EMailPageView.cpp" line="2478"/>
-        <location filename="../EMailPageView.cpp" line="2489"/>
+        <location filename="../EMailPageView.cpp" line="1851"/>
+        <location filename="../EMailPageView.cpp" line="2537"/>
+        <location filename="../EMailPageView.cpp" line="2548"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1835"/>
+        <location filename="../EMailPageView.cpp" line="1871"/>
         <source>This message is encrypted and signed</source>
         <translation>此郵件已加密並簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1859"/>
+        <location filename="../EMailPageView.cpp" line="1895"/>
         <source>The recipients are not named in the headers.</source>
         <translation>收件者未在標頭中指名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1860"/>
+        <location filename="../EMailPageView.cpp" line="1896"/>
         <source>Addressed to %1</source>
         <translation>收件者：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1930"/>
+        <location filename="../EMailPageView.cpp" line="1933"/>
+        <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
+        <translation>收件者未具名，因此在你嘗試之前無從得知是否能開啟此訊息。</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1966"/>
         <source>attach a public key</source>
         <translation>附加公鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1951"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>add text to this message</source>
         <translation>新增文字至此郵件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1968"/>
+        <location filename="../EMailPageView.cpp" line="2004"/>
         <source>Message Locked</source>
         <translation>郵件已鎖定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1969"/>
+        <location filename="../EMailPageView.cpp" line="2005"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>此郵件僅供檢視，因此無法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1978"/>
+        <location filename="../EMailPageView.cpp" line="2014"/>
         <source>Message Is Encrypted</source>
         <translation>郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1979"/>
+        <location filename="../EMailPageView.cpp" line="2015"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>請先解密此郵件，再嘗試%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1987"/>
+        <location filename="../EMailPageView.cpp" line="2023"/>
         <source>Message Is Signed</source>
         <translation>郵件已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2037"/>
+        <location filename="../EMailPageView.cpp" line="2073"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
         <translation>這是您仍在撰寫的草稿，不是已收到的訊息，因此這裡還沒有任何可處理的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2102"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
         <translation>此訊息本來就無法編輯：它已簽署或加密，因此已受到保護，無法被改寫。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2216"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>尚未設定郵件帳戶。請在「設定」的「郵件帳戶」下新增一個帳戶，即可傳送此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2182"/>
+        <location filename="../EMailPageView.cpp" line="2219"/>
         <source>Fill in who this message is from.</source>
         <translation>請填寫此訊息的寄件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2184"/>
+        <location filename="../EMailPageView.cpp" line="2221"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>寄件人地址看起來不像電子郵件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2186"/>
+        <location filename="../EMailPageView.cpp" line="2223"/>
         <source>Add at least one recipient.</source>
         <translation>請至少新增一位收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2188"/>
+        <location filename="../EMailPageView.cpp" line="2225"/>
         <source>Give this message a subject.</source>
         <translation>請為此訊息填寫主旨。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2197"/>
+        <location filename="../EMailPageView.cpp" line="2234"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>這看起來不像電子郵件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2305"/>
+        <location filename="../EMailPageView.cpp" line="2353"/>
         <source>Encrypted</source>
         <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2338"/>
+        <location filename="../EMailPageView.cpp" line="2389"/>
+        <source>Signature could not be checked</source>
+        <translation>無法檢查簽章</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2393"/>
         <source>Malformed OpenPGP structure</source>
         <translation>OpenPGP 結構格式錯誤</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2345"/>
+        <location filename="../EMailPageView.cpp" line="2400"/>
         <source>Not signed or encrypted</source>
         <translation>未簽署且未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailPageView.cpp" line="2502"/>
         <source>This message is locked for inspection.</source>
         <translation>此訊息已鎖定，僅供檢視。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailPageView.cpp" line="2517"/>
         <source>Sign...</source>
         <translation>簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2459"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Encrypt...</source>
         <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2460"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Encrypt and Sign...</source>
         <translation>加密並簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2464"/>
+        <location filename="../EMailPageView.cpp" line="2523"/>
         <source>Verify Signature</source>
         <translation>驗證簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailPageView.cpp" line="2524"/>
         <source>Signature Details...</source>
         <translation>簽章詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2469"/>
+        <location filename="../EMailPageView.cpp" line="2528"/>
         <source>Sign Again With Another Key...</source>
         <translation>使用另一個金鑰重新簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2470"/>
-        <location filename="../EMailPageView.cpp" line="2495"/>
+        <location filename="../EMailPageView.cpp" line="2529"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <source>Remove Signature...</source>
         <translation>移除簽章...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2479"/>
-        <location filename="../EMailPageView.cpp" line="2488"/>
+        <location filename="../EMailPageView.cpp" line="2538"/>
+        <location filename="../EMailPageView.cpp" line="2547"/>
         <source>Decrypt and Verify</source>
         <translation>解密並驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2481"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>Encryption Details...</source>
         <translation>加密詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2491"/>
+        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="2550"/>
         <source>Details...</source>
         <translation>詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2505"/>
+        <location filename="../EMailPageView.cpp" line="2564"/>
         <source>Decrypt this message first.</source>
         <translation>請先解密此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2514"/>
+        <location filename="../EMailPageView.cpp" line="2573"/>
         <source>What Is Wrong With This Message?</source>
         <translation>此訊息有什麼問題？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2518"/>
+        <location filename="../EMailPageView.cpp" line="2577"/>
         <source>Try to Verify Anyway</source>
         <translation>仍嘗試驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2519"/>
+        <location filename="../EMailPageView.cpp" line="2578"/>
         <source>Try to Decrypt Anyway</source>
         <translation>仍嘗試解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2534"/>
+        <location filename="../EMailPageView.cpp" line="2593"/>
         <source>Signature Not Reachable</source>
         <translation>無法取得簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2535"/>
+        <location filename="../EMailPageView.cpp" line="2594"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>簽章位於此訊息的加密部分。請先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2539"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>Nothing to Remove</source>
         <translation>沒有可移除的簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2540"/>
+        <location filename="../EMailPageView.cpp" line="2599"/>
         <source>This message carries no signature.</source>
         <translation>此訊息沒有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2544"/>
+        <location filename="../EMailPageView.cpp" line="2603"/>
         <source>Cannot Remove the Signature</source>
         <translation>無法移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2545"/>
+        <location filename="../EMailPageView.cpp" line="2604"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>此訊息未充分遵循 RFC 3156，無法安全地移除簽章。請改為編輯原始來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2553"/>
+        <location filename="../EMailPageView.cpp" line="2612"/>
         <source>Remove Signature</source>
         <translation>移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2554"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Remove the signature from this message?
 
 The signature is discarded and the message becomes an ordinary, unsigned one. The message itself is kept exactly as it is. This cannot be undone.</source>
@@ -1477,57 +1564,56 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 簽章將被丟棄，訊息將變成一般未簽署的訊息。訊息本身會保持原樣。此操作無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2730"/>
         <source>signed</source>
         <translation>已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2689"/>
+        <location filename="../EMailPageView.cpp" line="2756"/>
         <source>unsigned</source>
         <translation>未簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation>無法傳送</translation>
+        <translation type="vanished">無法傳送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2827"/>
+        <location filename="../EMailPageView.cpp" line="2894"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>此訊息需要有寄件者和至少一位收件者才能傳送。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Message</source>
         <translation>訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="382"/>
+        <location filename="../EMailPageView.cpp" line="383"/>
         <source>Structure</source>
         <translation>結構</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="381"/>
+        <location filename="../EMailPageView.cpp" line="382"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="362"/>
+        <location filename="../EMailPageView.cpp" line="363"/>
         <source>Message Details</source>
         <translation>訊息詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="383"/>
+        <location filename="../EMailPageView.cpp" line="384"/>
         <source>Headers</source>
         <translation>標頭</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="524"/>
+        <location filename="../EMailPageView.cpp" line="523"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
@@ -1536,199 +1622,198 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 密件收件者永遠不會被寫入訊息中：Bcc 標頭會讓所有收件者得知誰被密件副本。密件收件者只用來選擇加密收件者，且不會隨檔案儲存。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="561"/>
+        <location filename="../EMailPageView.cpp" line="560"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>顯示副本與密件副本 (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="624"/>
-        <location filename="../EMailPageView.cpp" line="679"/>
-        <location filename="../EMailPageView.cpp" line="750"/>
-        <location filename="../EMailPageView.cpp" line="900"/>
+        <location filename="../EMailPageView.cpp" line="623"/>
+        <location filename="../EMailPageView.cpp" line="678"/>
+        <location filename="../EMailPageView.cpp" line="749"/>
+        <location filename="../EMailPageView.cpp" line="899"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="633"/>
+        <location filename="../EMailPageView.cpp" line="632"/>
         <source>Show the message</source>
         <translation>顯示訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="635"/>
+        <location filename="../EMailPageView.cpp" line="634"/>
         <source>Show the raw document</source>
         <translation>顯示原始文件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="687"/>
+        <location filename="../EMailPageView.cpp" line="686"/>
         <source>Reply</source>
         <translation>回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="687"/>
         <source>Write a reply to the sender.</source>
         <translation>撰寫回覆給寄件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="691"/>
+        <location filename="../EMailPageView.cpp" line="690"/>
         <source>Reply All</source>
         <translation>全部回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="692"/>
+        <location filename="../EMailPageView.cpp" line="691"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>撰寫回覆給寄件者和所有其他收件者。不包含密件副本收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="696"/>
+        <location filename="../EMailPageView.cpp" line="695"/>
         <source>Forward</source>
         <translation>轉寄</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="697"/>
+        <location filename="../EMailPageView.cpp" line="696"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>轉寄此訊息及其附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="728"/>
+        <location filename="../EMailPageView.cpp" line="727"/>
         <source>Read-only</source>
         <translation>唯讀</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="729"/>
+        <location filename="../EMailPageView.cpp" line="728"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>鎖定此訊息，使其無法編輯或重寫。回覆和轉寄仍可運作，並產生新訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="751"/>
+        <location filename="../EMailPageView.cpp" line="750"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>顯示此訊息的已知資訊：簽章、結構和標頭。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Signed</source>
         <translation>已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="861"/>
+        <location filename="../EMailPageView.cpp" line="860"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="906"/>
         <source>Attach File...</source>
         <translation>附加檔案...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3107"/>
+        <location filename="../EMailPageView.cpp" line="914"/>
+        <location filename="../EMailPageView.cpp" line="3179"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3094"/>
+        <location filename="../EMailPageView.cpp" line="917"/>
+        <location filename="../EMailPageView.cpp" line="3166"/>
         <source>Save...</source>
         <translation>儲存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="922"/>
+        <location filename="../EMailPageView.cpp" line="921"/>
         <source>Save All...</source>
         <translation>全部儲存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1168"/>
+        <location filename="../EMailPageView.cpp" line="1172"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>此訊息僅供檢視。無法編輯或重寫；回覆和轉寄仍可使用，並會產生新訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1188"/>
+        <location filename="../EMailPageView.cpp" line="1192"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>此訊息已簽署。編輯前請先移除簽章。在簽章下進行編輯會被視為偽造。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1209"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>此訊息以 HTML 撰寫。顯示為原始碼而非轉譯結果：此處不會載入圖片或連結。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1537"/>
+        <location filename="../EMailPageView.cpp" line="1540"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>唯讀。這些位元組受到保護。若要編輯，請移除簽章或解密訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1617"/>
+        <location filename="../EMailPageView.cpp" line="1625"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>此訊息無法組裝以供檢視，因此此處沒有可顯示的內容。訊息本身未變更。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1682"/>
+        <location filename="../EMailPageView.cpp" line="1718"/>
         <source>Cannot Reply</source>
         <translation>無法回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1684"/>
+        <location filename="../EMailPageView.cpp" line="1720"/>
         <source>Cannot Reply to All</source>
         <translation>無法回覆所有人</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1688"/>
+        <location filename="../EMailPageView.cpp" line="1724"/>
         <source>Cannot Forward</source>
         <translation>無法轉寄</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1694"/>
+        <location filename="../EMailPageView.cpp" line="1730"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation>此訊息本身並未變更。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1709"/>
+        <location filename="../EMailPageView.cpp" line="1745"/>
         <source>A new message cannot be opened from here, because this view is not inside a window that holds tabs.</source>
         <translation>無法從此處開啟新訊息，因為此檢視不在包含分頁的視窗內。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1736"/>
+        <location filename="../EMailPageView.cpp" line="1772"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>無法組合新訊息。這通常表示原始訊息中有部分無法重新編碼，最常見的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1754"/>
+        <location filename="../EMailPageView.cpp" line="1790"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>無法開啟新訊息的分頁。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1765"/>
+        <location filename="../EMailPageView.cpp" line="1801"/>
         <source>The new tab opened, but it is not showing a message view, so there is nowhere to put the reply. The tab can be closed.</source>
         <translation>新分頁已開啟，但它沒有顯示訊息檢視，因此沒有地方放置回覆。該分頁可以關閉。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1897"/>
         <source>The recipients are not named, so whether you can open this cannot be told until you try.</source>
-        <translation>收件者未具名，因此是否能開啟此訊息，必須嘗試後才能得知。</translation>
+        <translation type="vanished">收件者未具名，因此是否能開啟此訊息，必須嘗試後才能得知。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1913"/>
+        <location filename="../EMailPageView.cpp" line="1949"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>您未持有這些電子郵件地址中任何一個對應的私鑰。除非此訊息同時也加密到此處未列出的金鑰，否則無法在此電腦上開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1922"/>
+        <location filename="../EMailPageView.cpp" line="1958"/>
         <source>You hold the private key for %1.</source>
         <translation>您持有 %1 的私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1959"/>
         <source>You hold private keys for %1.</source>
         <translation>您持有 %1 的多把私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1988"/>
+        <location filename="../EMailPageView.cpp" line="2024"/>
         <source>This message is signed, so it cannot be changed: an edit under a signature reads as a forgery.
 
 Remove the signature and make it an ordinary message?</source>
@@ -1737,103 +1822,113 @@ Remove the signature and make it an ordinary message?</source>
 是否移除簽章並使其成為一般訊息？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2312"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>Encrypted, signature not checked</source>
         <translation>已加密，未檢查簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2313"/>
+        <location filename="../EMailPageView.cpp" line="2361"/>
         <source>Signature not checked</source>
         <translation>簽章未檢查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2317"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>Encrypted, signature verified</source>
         <translation>已加密，簽章已驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2318"/>
+        <location filename="../EMailPageView.cpp" line="2366"/>
         <source>Signature verified</source>
         <translation>簽章已驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2322"/>
+        <location filename="../EMailPageView.cpp" line="2370"/>
         <source>Signed by a different address</source>
         <translation>由不同地址簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2326"/>
+        <location filename="../EMailPageView.cpp" line="2374"/>
         <source>Signature or key expired</source>
         <translation>簽章或金鑰已過期</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2330"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>Signed by an unknown key</source>
         <translation>由未知金鑰簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2334"/>
+        <location filename="../EMailPageView.cpp" line="2382"/>
         <source>Bad signature</source>
         <translation>簽章無效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2671"/>
+        <location filename="../EMailPageView.cpp" line="2733"/>
         <source>signed, not checked</source>
         <translation>已簽署，未檢查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2738"/>
+        <source>signed, could not be checked</source>
+        <translation>已簽署，無法檢查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2744"/>
         <source>signature not good</source>
         <translation>簽章無效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2705"/>
+        <location filename="../EMailPageView.cpp" line="2772"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>此訊息的某些部分位於簽章區段之外。這些部分不受簽章涵蓋，可能由任何人新增。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2719"/>
+        <location filename="../EMailPageView.cpp" line="2786"/>
         <source>1 attachment</source>
         <translation>1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2720"/>
+        <location filename="../EMailPageView.cpp" line="2787"/>
         <source>%1 attachments</source>
         <translation>%1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2775"/>
+        <location filename="../EMailPageView.cpp" line="2842"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>電子郵件訊息 (*.eml);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2957"/>
-        <location filename="../EMailPageView.cpp" line="3024"/>
+        <location filename="../EMailPageView.cpp" line="2893"/>
+        <source>Cannot Send</source>
+        <translation>無法傳送</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3029"/>
+        <location filename="../EMailPageView.cpp" line="3096"/>
         <source>Attach Files</source>
         <translation>附加檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2987"/>
+        <location filename="../EMailPageView.cpp" line="3059"/>
         <source>%1 is a folder</source>
         <translation>%1 是資料夾</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2988"/>
+        <location filename="../EMailPageView.cpp" line="3060"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 不是一般檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2993"/>
+        <location filename="../EMailPageView.cpp" line="3065"/>
         <source>%1 is too large (%2); the most that can be attached is %3</source>
         <translation>%1 太大 (%2)；最多可附加 %3</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2999"/>
+        <location filename="../EMailPageView.cpp" line="3071"/>
         <source>%1: %2</source>
         <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3026"/>
+        <location filename="../EMailPageView.cpp" line="3098"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1842,7 +1937,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3027"/>
+        <location filename="../EMailPageView.cpp" line="3099"/>
         <source>These were not attached:
 
 %1</source>
@@ -1851,30 +1946,30 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3093"/>
+        <location filename="../EMailPageView.cpp" line="3165"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3102"/>
+        <location filename="../EMailPageView.cpp" line="3174"/>
         <source>Import Key</source>
         <translation>匯入金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3106"/>
+        <location filename="../EMailPageView.cpp" line="3178"/>
         <source>Copy Name</source>
         <translation>複製名稱</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3180"/>
-        <location filename="../EMailPageView.cpp" line="3195"/>
-        <location filename="../EMailPageView.cpp" line="3210"/>
-        <location filename="../EMailPageView.cpp" line="3218"/>
+        <location filename="../EMailPageView.cpp" line="3252"/>
+        <location filename="../EMailPageView.cpp" line="3267"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
+        <location filename="../EMailPageView.cpp" line="3290"/>
         <source>Open Attachment</source>
         <translation>開啟附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3181"/>
+        <location filename="../EMailPageView.cpp" line="3253"/>
         <source>%1 is not a kind of file this program will open for you, because opening it would mean running it or handing it to something that might.
 
 Save it instead, and open it yourself if you are sure of where it came from.</source>
@@ -1883,27 +1978,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 請改為儲存它，並在確定其來源後自行開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3196"/>
+        <location filename="../EMailPageView.cpp" line="3268"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>無法建立用來開啟 %1 的暫存資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3211"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>無法將 %1 寫出以開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3219"/>
+        <location filename="../EMailPageView.cpp" line="3291"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>此系統上沒有註冊可開啟 %1 的程式。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3254"/>
+        <location filename="../EMailPageView.cpp" line="3326"/>
         <source>Remove Attachment</source>
         <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3255"/>
+        <location filename="../EMailPageView.cpp" line="3327"/>
         <source>Take out of this message:
 
 %1
@@ -1916,12 +2011,12 @@ This message came from somewhere else, so unless these have been saved already t
 此訊息來自其他地方，因此除非這些附件已儲存，否則這將是唯一的副本。移除後無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3381"/>
+        <location filename="../EMailPageView.cpp" line="3453"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3387"/>
+        <location filename="../EMailPageView.cpp" line="3459"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -1930,35 +2025,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3394"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>Saved 1 file.</source>
         <translation>已儲存 1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3395"/>
+        <location filename="../EMailPageView.cpp" line="3467"/>
         <source>Saved %1 files.</source>
         <translation>已儲存 %1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3335"/>
-        <location filename="../EMailPageView.cpp" line="3344"/>
+        <location filename="../EMailPageView.cpp" line="3407"/>
+        <location filename="../EMailPageView.cpp" line="3416"/>
         <source>Save Attachment</source>
         <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3345"/>
+        <location filename="../EMailPageView.cpp" line="3417"/>
         <source>Cannot write %1.</source>
         <translation>無法寫入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3351"/>
-        <location filename="../EMailPageView.cpp" line="3368"/>
-        <location filename="../EMailPageView.cpp" line="3386"/>
+        <location filename="../EMailPageView.cpp" line="3423"/>
+        <location filename="../EMailPageView.cpp" line="3440"/>
+        <location filename="../EMailPageView.cpp" line="3458"/>
         <source>Save Attachments</source>
         <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3369"/>
+        <location filename="../EMailPageView.cpp" line="3441"/>
         <source>Could not write: %1</source>
         <translation>無法寫入：%1</translation>
     </message>
@@ -2007,9 +2102,8 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>有效，但有問題</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation>有效，金鑰未完全信任</translation>
+        <translation type="vanished">有效，金鑰未完全信任</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
@@ -2088,234 +2182,260 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>匯入此訊息中的金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="291"/>
+        <location filename="../EMailSecurityView.cpp" line="297"/>
+        <source>Verify Signatures</source>
+        <translation>驗證簽章</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="298"/>
         <source>Verify Again</source>
         <translation>重新驗證</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="346"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>Signatures</source>
         <translation>簽章</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="350"/>
+        <location filename="../EMailSecurityView.cpp" line="357"/>
         <source>Signature %1</source>
         <translation>簽章 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="353"/>
+        <location filename="../EMailSecurityView.cpp" line="360"/>
         <source>covers %1</source>
         <translation>涵蓋 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="354"/>
+        <location filename="../EMailSecurityView.cpp" line="361"/>
         <source>covers %1, nested %2 deep</source>
         <translation>涵蓋 %1，巢狀 %2 層</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="367"/>
+        <location filename="../EMailSecurityView.cpp" line="374"/>
         <source>Result</source>
         <translation>結果</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="378"/>
+        <location filename="../EMailSecurityView.cpp" line="385"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation>此區段已簽署，但尚未經過驗證</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="379"/>
+        <location filename="../EMailSecurityView.cpp" line="386"/>
         <source>this section is signed, but verifying it produced no result: the signing key may not be in your keyring</source>
         <translation>此區段已簽署，但驗證未產生任何結果：簽署金鑰可能不在您的金鑰環中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="387"/>
+        <location filename="../EMailSecurityView.cpp" line="394"/>
         <source>Unknown signer</source>
         <translation>未知簽署者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <location filename="../EMailSecurityView.cpp" line="409"/>
         <source>Different address</source>
         <translation>不同地址</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <location filename="../EMailSecurityView.cpp" line="412"/>
         <source>the signature is valid, but the key belongs to %1 while this message says it is from %2. A valid signature says who signed the bytes, not who sent the message.</source>
         <translation>簽章有效，但金鑰屬於 %1，而此訊息聲稱來自 %2。有效的簽章說明誰簽署了這些位元組，而非誰傳送了此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="421"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Public key algorithm</source>
         <translation>公鑰演算法</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="422"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signed at</source>
         <translation>簽署時間</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="428"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>Declared hash (micalg)</source>
         <translation>宣告的雜湊（micalg）</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="429"/>
+        <location filename="../EMailSecurityView.cpp" line="436"/>
         <source>Signature hash</source>
         <translation>簽章雜湊</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="433"/>
+        <location filename="../EMailSecurityView.cpp" line="440"/>
         <source>Hash mismatch</source>
         <translation>雜湊不符</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation>訊息宣告 %1，但簽章使用的卻是 %2</translation>
+        <translation type="vanished">訊息宣告 %1，但簽章使用的卻是 %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <location filename="../EMailSecurityView.cpp" line="449"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="454"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>Recipients</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="468"/>
         <source>addressed and encrypted to</source>
         <translation>指定收件人並加密給</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="696"/>
+        <location filename="../EMailSecurityView.cpp" line="498"/>
+        <source>the sender chose not to record who this recipient is</source>
+        <translation>驗證者選擇不記錄此收件者的身分</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="662"/>
+        <source>This message claims to use OpenPGP, but its structure does not follow RFC 3156.</source>
+        <translation>此訊息宣稱使用 OpenPGP，但其結構不符合 RFC 3156。</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="704"/>
         <source>There is nothing further to report about this message.</source>
         <translation>此訊息沒有其他需要報告的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="480"/>
+        <location filename="../EMailSecurityView.cpp" line="487"/>
         <source>Key %1</source>
         <translation>金鑰 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="483"/>
+        <location filename="../EMailSecurityView.cpp" line="97"/>
+        <source>valid, but key not fully trusted</source>
+        <translation>有效，但金鑰未完全信任</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
+        <source>the message declares %1, but the signature used %2</source>
+        <translation>此訊息宣告為 %1，但簽章使用了 %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="478"/>
+        <source>in %1, but not encrypted to it: they cannot read this message</source>
+        <translation>在 %1 中，但未加密至該對象：他們無法讀取此訊息</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation>已加密給，但不在可見的標頭中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="488"/>
+        <location filename="../EMailSecurityView.cpp" line="495"/>
         <source>Hidden recipient</source>
         <translation>隱藏收件者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation>寄件者選擇不記錄此身分</translation>
+        <translation type="vanished">寄件者選擇不記錄此身分</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="250"/>
         <location filename="../EMailSecurityView.cpp" line="253"/>
-        <location filename="../EMailSecurityView.cpp" line="420"/>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
-        <location filename="../EMailSecurityView.cpp" line="560"/>
+        <location filename="../EMailSecurityView.cpp" line="427"/>
+        <location filename="../EMailSecurityView.cpp" line="505"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Fingerprint</source>
         <translation>指紋</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation>位於 %1，但未加密給它：他們無法讀取此內容</translation>
+        <translation type="vanished">位於 %1，但未加密給它：他們無法讀取此內容</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="504"/>
-        <location filename="../EMailSecurityView.cpp" line="585"/>
+        <location filename="../EMailSecurityView.cpp" line="512"/>
+        <location filename="../EMailSecurityView.cpp" line="593"/>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="506"/>
+        <location filename="../EMailSecurityView.cpp" line="514"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
         <translation>引擎回報的是主金鑰，而非實際使用的加密子金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="517"/>
+        <location filename="../EMailSecurityView.cpp" line="525"/>
         <source>Keys for these addresses</source>
         <translation>這些地址的金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="532"/>
+        <location filename="../EMailSecurityView.cpp" line="540"/>
         <source>no key found</source>
         <translation>找不到金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>1 key</source>
         <translation>1 個金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="542"/>
+        <location filename="../EMailSecurityView.cpp" line="550"/>
         <source>%1 keys</source>
         <translation>%1 個金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="553"/>
+        <location filename="../EMailSecurityView.cpp" line="561"/>
         <source>key is %1</source>
         <translation>金鑰為 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="568"/>
+        <location filename="../EMailSecurityView.cpp" line="576"/>
         <source>Identity</source>
         <translation>身分</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="571"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation>此地址位於金鑰的已吊銷使用者 ID 上</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="574"/>
+        <location filename="../EMailSecurityView.cpp" line="582"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation>此地址是該金鑰的主要使用者 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="579"/>
+        <location filename="../EMailSecurityView.cpp" line="587"/>
         <source>this address is a secondary user ID of the key</source>
         <translation>此地址是該金鑰的次要使用者 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="586"/>
+        <location filename="../EMailSecurityView.cpp" line="594"/>
         <source>this key cannot be used for encryption</source>
         <translation>此金鑰無法用於加密</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="599"/>
+        <location filename="../EMailSecurityView.cpp" line="607"/>
         <source>What stands out</source>
         <translation>顯著特點</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="639"/>
+        <location filename="../EMailSecurityView.cpp" line="647"/>
         <source>This message is not signed or encrypted.</source>
         <translation>此訊息未簽署且未加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="642"/>
+        <location filename="../EMailSecurityView.cpp" line="650"/>
         <source>This message carries a signature.</source>
         <translation>此訊息帶有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="645"/>
+        <location filename="../EMailSecurityView.cpp" line="653"/>
         <source>This message is encrypted.</source>
         <translation>此訊息已加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="649"/>
+        <location filename="../EMailSecurityView.cpp" line="657"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation>此訊息已加密並帶有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="654"/>
         <source>This message claims to use OpenPGP but its structure does not follow RFC 3156.</source>
-        <translation>此訊息聲稱使用 OpenPGP，但其結構不符合 RFC 3156。</translation>
+        <translation type="vanished">此訊息聲稱使用 OpenPGP，但其結構不符合 RFC 3156。</translation>
     </message>
 </context>
 <context>
@@ -2393,7 +2513,7 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>在寄件備份中保留副本</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="493"/>
+        <location filename="../EMailSendDialog.cpp" line="492"/>
         <source>%1 port %2 · %3</source>
         <translation>%1 連接埠 %2 · %3</translation>
     </message>
@@ -2414,189 +2534,189 @@ This message came from somewhere else, so unless these have been saved already t
         <translation>複製詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="366"/>
+        <location filename="../EMailSendDialog.cpp" line="365"/>
         <source>These addresses are given to the outgoing server only. They do not appear in the message, so no other recipient can see them.</source>
         <translation>這些地址只會提供給外寄伺服器。它們不會出現在郵件中，因此其他收件者無法看到。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="402"/>
+        <location filename="../EMailSendDialog.cpp" line="401"/>
         <source>Send</source>
         <translation>傳送</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="404"/>
+        <location filename="../EMailSendDialog.cpp" line="403"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="465"/>
+        <location filename="../EMailSendDialog.cpp" line="464"/>
         <source>No outgoing account is configured.</source>
         <translation>未設定任何外寄帳戶。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="483"/>
+        <location filename="../EMailSendDialog.cpp" line="482"/>
         <source>No password is stored for this account, so nothing can be sent through it. Set the password in Settings, under Mail Accounts, and turn on the option to remember it.</source>
         <translation>此帳戶未儲存密碼，因此無法透過它傳送任何郵件。請在「設定」的「郵件帳戶」下設定密碼，並開啟記住密碼的選項。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="517"/>
-        <location filename="../EMailSendDialog.cpp" line="900"/>
+        <location filename="../EMailSendDialog.cpp" line="516"/>
+        <location filename="../EMailSendDialog.cpp" line="898"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="518"/>
+        <location filename="../EMailSendDialog.cpp" line="517"/>
         <source>Sending. This window will say what happened.</source>
         <translation>正在傳送。此視窗會顯示傳送結果。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="572"/>
+        <location filename="../EMailSendDialog.cpp" line="571"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
         <translation>此帳戶僅設定為傳送，因此沒有信箱可存放副本。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="649"/>
+        <location filename="../EMailSendDialog.cpp" line="647"/>
         <source>a copy was put in %1, but it cannot be looked up afterwards: this message carries no Message-ID. A message sent exactly as it arrived is never given one, because adding it would change bytes a signature may cover.</source>
         <translation>副本已放入 %1，但之後無法查詢：此郵件沒有 Message-ID。完全按原樣傳送的郵件永遠不會獲得 Message-ID，因為加入它會變更簽章可能涵蓋的位元組。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="658"/>
+        <location filename="../EMailSendDialog.cpp" line="656"/>
         <source>no Sent folder could be identified for this account.</source>
         <translation>找不到此帳戶的寄件備份資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="664"/>
+        <location filename="../EMailSendDialog.cpp" line="662"/>
         <source>the copy could not be written to the mailbox.</source>
         <translation>無法將副本寫入信箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="665"/>
+        <location filename="../EMailSendDialog.cpp" line="663"/>
         <source>the copy could not be written to the mailbox: %1</source>
         <translation>無法將副本寫入信箱：%1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="698"/>
+        <location filename="../EMailSendDialog.cpp" line="696"/>
         <source>Stopping...</source>
         <translation>正在停止...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="712"/>
+        <location filename="../EMailSendDialog.cpp" line="710"/>
         <source>Still sending</source>
         <translation>仍在傳送</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="713"/>
+        <location filename="../EMailSendDialog.cpp" line="711"/>
         <source>This message is still being sent.</source>
         <translation>此郵件仍在傳送中。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="715"/>
+        <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>The server may already have accepted it. If you close this window now, you will not find out whether it was delivered, and sending it again could deliver it twice.</source>
         <translation>伺服器可能已接受該郵件。如果您現在關閉此視窗，將無法得知它是否已送達，而且再次傳送可能導致重複送達。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="718"/>
+        <location filename="../EMailSendDialog.cpp" line="716"/>
         <source>Keep Waiting</source>
         <translation>繼續等待</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="719"/>
+        <location filename="../EMailSendDialog.cpp" line="717"/>
         <source>Close Anyway</source>
         <translation>仍要關閉</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="757"/>
+        <location filename="../EMailSendDialog.cpp" line="755"/>
         <source>Not sent yet</source>
         <translation>尚未寄出</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="760"/>
+        <location filename="../EMailSendDialog.cpp" line="758"/>
         <source>Sending...</source>
         <translation>傳送中...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="764"/>
+        <location filename="../EMailSendDialog.cpp" line="762"/>
         <source>Unknown. The connection was lost after the message had been sent, so the server may or may not have accepted it. Check the Sent folder or the recipient before sending again: resending may deliver it twice.</source>
         <translation>未知。訊息寄出後連線中斷，因此伺服器可能已接受，也可能未接受。再次寄出前，請檢查寄件備份或收件者：重寄可能導致重複投遞。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="770"/>
+        <location filename="../EMailSendDialog.cpp" line="768"/>
         <source>Yes, accepted by the outgoing mail server</source>
         <translation>是，外寄郵件伺服器已接受。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="784"/>
+        <location filename="../EMailSendDialog.cpp" line="782"/>
         <source>Not saved</source>
         <translation>未儲存</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="789"/>
+        <location filename="../EMailSendDialog.cpp" line="787"/>
         <source>Saving a copy to Sent...</source>
         <translation>正在將副本儲存至寄件備份...</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="808"/>
+        <location filename="../EMailSendDialog.cpp" line="806"/>
         <source>No copy was kept.</source>
         <translation>未保留任何副本。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="809"/>
+        <location filename="../EMailSendDialog.cpp" line="807"/>
         <source>The message was sent, but %1</source>
         <translation>訊息已寄出，但 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="581"/>
+        <location filename="../EMailSendDialog.cpp" line="580"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
         <translation>此帳戶未儲存密碼，因此無法開啟其信箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="685"/>
+        <location filename="../EMailSendDialog.cpp" line="683"/>
         <source>The mailbox could not be reached.</source>
         <translation>無法連線到信箱。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="686"/>
+        <location filename="../EMailSendDialog.cpp" line="684"/>
         <source>The mailbox could not be reached: %1</source>
         <translation>無法連線到信箱：%1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="785"/>
+        <location filename="../EMailSendDialog.cpp" line="783"/>
         <source>Waits until the message is sent</source>
         <translation>等待訊息寄出</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="797"/>
+        <location filename="../EMailSendDialog.cpp" line="795"/>
         <source>Yes, your mail server had already filed it in %1</source>
         <translation>是的，您的郵件伺服器已將它歸檔於 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="799"/>
+        <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, saved to %1</source>
         <translation>是的，已儲存至 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="814"/>
+        <location filename="../EMailSendDialog.cpp" line="812"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
         <translation>已停止：未保留副本。郵件仍已傳送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="852"/>
+        <location filename="../EMailSendDialog.cpp" line="850"/>
         <source>It is not known whether this was sent.</source>
         <translation>無法確定這封郵件是否已傳送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="854"/>
+        <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>Handed to the outgoing mail server.</source>
         <translation>已交至外寄郵件伺服器。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="856"/>
+        <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Not sent.</source>
         <translation>未傳送。</translation>
     </message>
     <message>
-        <location filename="../EMailSendDialog.cpp" line="877"/>
-        <location filename="../EMailSendDialog.cpp" line="886"/>
+        <location filename="../EMailSendDialog.cpp" line="875"/>
+        <location filename="../EMailSendDialog.cpp" line="884"/>
         <source>Close (%1)</source>
         <translation>關閉 (%1)</translation>
     </message>
@@ -2667,10 +2787,14 @@ This message came from somewhere else, so unless these have been saved already t
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
-        <source>Cannot write %1.</source>
+        <source>Could not write %1.</source>
         <translation>無法寫入 %1。</translation>
     </message>
     <message>
+        <source>Cannot write %1.</source>
+        <translation type="vanished">無法寫入 %1。</translation>
+    </message>
+    <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
         <translation>此部分的 SHA-256：%1</translation>
@@ -2748,36 +2872,245 @@ This message came from somewhere else, so unless these have been saved already t
         <source>That message is too large to open</source>
         <translation>該郵件太大，無法開啟</translation>
     </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="87"/>
+        <source>The server&apos;s certificate is for a different host</source>
+        <translation>伺服器的憑證用於不同的主機。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="89"/>
+        <source>The certificate the server presented does not name the host you configured. This is what an interception looks like, so the connection was refused. Check the host name for a typo.</source>
+        <translation>伺服器出示的憑證並未指明您所設定的主機。這是攔截的跡象，因此已拒絕連線。請檢查主機名稱是否有拼寫錯誤。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="100"/>
+        <source>The server&apos;s certificate is not currently valid</source>
+        <translation>伺服器的憑證目前無效。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="102"/>
+        <source>The certificate has expired or is not valid yet. If your computer&apos;s clock is wrong, fix that first; otherwise the server&apos;s certificate needs renewing. This cannot be bypassed by trusting the certificate.</source>
+        <translation>該憑證已過期或尚未生效。如果您的電腦時鐘錯誤，請先修正；否則，伺服器的憑證需要更新。無法透過信任該憑證來繞過此問題。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="114"/>
+        <source>The server&apos;s certificate is not trusted</source>
+        <translation>伺服器的憑證不受信任。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="116"/>
+        <source>The certificate was not issued by an authority your system trusts. That is expected for a self-hosted server with its own certificate. You can examine it and choose to trust this exact certificate for this account.</source>
+        <translation>此憑證不是由您的系統信任的憑證授權單位所核發。對使用自有憑證的自架伺服器而言，這屬正常情況。您可以檢查該憑證，並選擇為此帳號信任此確切憑證。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="127"/>
+        <source>The server&apos;s certificate could not be read</source>
+        <translation>無法讀取伺服器的憑證。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="129"/>
+        <source>The certificate is of a type this application cannot verify, so the connection was refused.</source>
+        <translation>此應用程式無法驗證該憑證類型，因此連線已遭拒絕。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="138"/>
+        <source>The server&apos;s certificate was rejected</source>
+        <translation>伺服器的憑證已被拒絕。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="140"/>
+        <source>The certificate could not be verified, so the connection was refused.</source>
+        <translation>無法驗證該憑證，因此連線已遭拒絕。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="168"/>
+        <source>The server rejected the sender address</source>
+        <translation>伺服器拒絕了寄件者地址。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="170"/>
+        <source>The outgoing server would not accept mail from this address. It usually means the address does not match the account you signed in with.</source>
+        <translation>外寄伺服器不接受從此地址寄出的郵件。這通常表示該地址與您登入的帳戶不符。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="183"/>
+        <source>The server rejected a recipient</source>
+        <translation>伺服器拒絕了收件者</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="185"/>
+        <source>The server rejected the recipient %1</source>
+        <translation>伺服器拒絕了收件者 %1</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="191"/>
+        <source>The message was not sent to anyone. The server refused this recipient, and sending stops at the first refusal. Correct or remove the address and send again.</source>
+        <translation>該郵件未寄送給任何人。伺服器拒絕了此收件者，且寄送在第一次遭拒時停止。請更正或移除該地址後再寄送。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="201"/>
+        <source>The server rejected the message</source>
+        <translation>伺服器拒絕了該郵件</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="203"/>
+        <source>The outgoing server accepted the sender and recipients but refused the message itself. Its reply is shown below and usually explains why, often because of a size limit or a content policy.</source>
+        <translation>外寄伺服器接受了寄件者和收件者，但拒絕了郵件本身。其回覆顯示在下方，通常會說明原因，常見原因為大小限制或內容政策。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="213"/>
+        <source>The server refused to start an encrypted connection</source>
+        <translation>伺服器拒絕啟動加密連線</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="216"/>
+        <source>The connection was closed rather than continued unencrypted. Check whether this server expects a different security setting or port.</source>
+        <translation>連線已關閉，而非以未加密方式繼續。請檢查此伺服器是否預期不同的安全性設定或連接埠。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="226"/>
+        <location filename="../EMailNetError.cpp" line="319"/>
+        <source>Sign-in was refused</source>
+        <translation>登入遭到拒絕</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="227"/>
+        <source>The server did not accept the username and password.</source>
+        <translation>伺服器未接受該使用者名稱與密碼。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="235"/>
+        <location filename="../EMailNetError.cpp" line="345"/>
+        <source>The folder could not be opened</source>
+        <translation>無法開啟資料夾</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="242"/>
+        <source>The search could not be completed</source>
+        <translation>無法完成搜尋</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="249"/>
+        <location filename="../EMailNetError.cpp" line="354"/>
+        <source>The message could not be retrieved</source>
+        <translation>無法取得郵件</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="255"/>
+        <source>The server rejected a command</source>
+        <translation>伺服器拒絕了一個指令</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="277"/>
+        <source>The outcome is unknown</source>
+        <translation>結果未知</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="288"/>
+        <location filename="../EMailNetError.cpp" line="441"/>
+        <source>Stopped</source>
+        <translation>已停止</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="303"/>
+        <source>The server stopped responding</source>
+        <translation>伺服器停止回應</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="320"/>
+        <source>The server did not accept the username and password. If this account belongs to a provider that requires signing in through its own web page, an ordinary password will not work and you will need an app-specific password instead.</source>
+        <translation>伺服器不接受使用者名稱和密碼。如果此帳號屬於需要透過其自家網頁登入的提供者，一般密碼將無法使用，您需要改用應用程式專用密碼。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="336"/>
+        <source>The message is too large for this server</source>
+        <translation>此郵件對這台伺服器來說太大</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="363"/>
+        <source>The server sent an unexpected response</source>
+        <translation>伺服器傳送了未預期的回應</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="377"/>
+        <source>The server could not be found</source>
+        <translation>找不到伺服器</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="379"/>
+        <source>The host name did not resolve. Check it for a typo and check that this computer is online.</source>
+        <translation>主機名稱無法解析。請檢查是否有拼寫錯誤，並確認這台電腦已連線。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="387"/>
+        <source>The server could not be reached</source>
+        <translation>無法連線到伺服器</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="389"/>
+        <source>The host resolved but refused or ignored the connection. Check the port and security settings, and whether a firewall is in the way.</source>
+        <translation>主機已解析，但拒絕或忽略了連線。請檢查連接埠和安全性設定，以及是否有防火牆阻擋。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="399"/>
+        <source>The encrypted connection could not be established</source>
+        <translation>無法建立加密連線</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="401"/>
+        <source>The server and this application could not agree on how to secure the connection. A server that only offers outdated encryption will fail here, which is deliberate.</source>
+        <translation>伺服器與此應用程式無法達成保護連線安全性的共識。僅提供過時加密的伺服器在此會失敗，這是刻意為之。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="419"/>
+        <source>The operation failed</source>
+        <translation>操作失敗</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="427"/>
+        <source>%1 would not start an encrypted connection</source>
+        <translation>%1 不願建立加密連線。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="430"/>
+        <source>The connection was closed rather than continued unencrypted, so your password was never sent. Check whether this server expects a different security setting or a different port.</source>
+        <translation>連線已關閉，而不是以未加密方式繼續，因此您的密碼從未送出。請檢查此伺服器是否預期不同的安全性設定或連接埠。</translation>
+    </message>
+    <message>
+        <location filename="../EMailNetError.cpp" line="448"/>
+        <source>Something went wrong inside this application</source>
+        <translation>此應用程式內部發生錯誤。</translation>
+    </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="740"/>
+        <location filename="../EMailModule.cpp" line="751"/>
         <source>Mail Editor</source>
         <translation>電子郵件編輯器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="742"/>
+        <location filename="../EMailModule.cpp" line="753"/>
         <source>Open a new text editor for email.</source>
         <translation>開啟新的電子郵件文字編輯器。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="766"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Open IMAP Controller</source>
         <translation>開啟 IMAP 控制器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="770"/>
+        <location filename="../EMailModule.cpp" line="781"/>
         <source>Open IMAP Controller Dialog</source>
         <translation>開啟 IMAP 控制器對話方塊</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="776"/>
+        <location filename="../EMailModule.cpp" line="787"/>
         <source>No mail account</source>
         <translation>沒有郵件帳戶</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="777"/>
+        <location filename="../EMailModule.cpp" line="788"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation>請先在設定中設定已啟用 IMAP 的郵件帳戶。</translation>
     </message>
@@ -2785,172 +3118,188 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1764"/>
+        <location filename="../EMailHelper.cpp" line="1836"/>
         <source>Signed part no longer in canonical form</source>
         <translation>簽署部分已非標準形式</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1765"/>
         <source>The signed part contains line endings that are not CRLF, which is not the form a signature is computed over. Something rewrote this message after it was signed, normally a program that changed line endings while saving or copying it rather than an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
-        <translation>簽署部分包含非 CRLF 的行尾，這不是計算簽章所依據的形式。此訊息在簽署後遭到重寫，通常是程式在儲存或複製時變更了行尾，而非攻擊。簽章無法針對這些位元組驗證，匯入寄件者的金鑰也不會改變這一點。檢查時需要原始未修改的訊息。</translation>
+        <translation type="vanished">簽署部分包含非 CRLF 的行尾，這不是計算簽章所依據的形式。此訊息在簽署後遭到重寫，通常是程式在儲存或複製時變更了行尾，而非攻擊。簽章無法針對這些位元組驗證，匯入寄件者的金鑰也不會改變這一點。檢查時需要原始未修改的訊息。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1786"/>
+        <location filename="../EMailHelper.cpp" line="1858"/>
         <source>Duplicate %1 header</source>
         <translation>重複的 %1 標頭</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1787"/>
+        <location filename="../EMailHelper.cpp" line="1859"/>
         <source>This message carries %1 copies of a header that may appear only once. Different mail programs pick different copies, so what you see here may not be what another reader sees.</source>
         <translation>此訊息包含 %1 份只能出現一次的標頭。不同的郵件程式會選取不同的副本，因此您在這裡看到的可能與其他讀者看到的不同。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1800"/>
+        <location filename="../EMailHelper.cpp" line="1872"/>
         <source>Address may be disguised</source>
         <translation>地址可能經過偽裝</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1801"/>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different, familiar address.</source>
-        <translation>「%1」中的網域使用了可被繪製成看似另一個熟悉地址的字元。</translation>
+        <translation type="vanished">「%1」中的網域使用了可被繪製成看似另一個熟悉地址的字元。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1815"/>
+        <location filename="../EMailHelper.cpp" line="1887"/>
         <source>Replies go somewhere else</source>
         <translation>回覆會寄到其他地方</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1816"/>
         <source>This message is from &quot;%1&quot; but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
+        <translation type="vanished">此訊息來自「%1」，但回覆會寄到「%2」，這是不同的網域。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1837"/>
+        <source>The signed part contains line endings that are not CRLF, which is not the form the signature was computed over. Something rewrote this message after it was signed, usually a program that changed line endings while saving or copying it, not an attack. The signature cannot verify against these bytes, and importing the sender&apos;s key will not change that. Checking it needs the original, unmodified message.</source>
+        <translation>簽署的部分包含非 CRLF 的行結尾，這不是簽章計算時所用的形式。此訊息在簽署後被某些程式重寫，通常是程式在儲存或複製時變更了行結尾，並非攻擊。簽章無法針對這些位元組驗證，匯入寄件者的金鑰也不會改變這一點。檢查它需要原始、未修改的訊息。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1873"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different, familiar address.</source>
+        <translation>「%1」中的網域使用了可被製成看似另一個熟悉地址的字元。</translation>
+    </message>
+    <message>
+        <location filename="../EMailHelper.cpp" line="1888"/>
+        <source>This message is from &quot;%1&quot;, but replies would be sent to &quot;%2&quot;, which is a different domain.</source>
         <translation>此訊息來自「%1」，但回覆會寄到「%2」，這是不同的網域。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1830"/>
+        <location filename="../EMailHelper.cpp" line="1902"/>
         <source>Malformed signed section</source>
         <translation>格式錯誤的簽署區段</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1831"/>
+        <location filename="../EMailHelper.cpp" line="1903"/>
         <source>A signed section must contain exactly two parts; this one contains %1. It may not verify, and what it covers is ambiguous.</source>
         <translation>簽署區段必須恰好包含兩個部分；此區段包含 %1 個。它可能無法驗證，且其涵蓋的內容不明確。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1839"/>
+        <location filename="../EMailHelper.cpp" line="1911"/>
         <source>Malformed encrypted section</source>
         <translation>格式錯誤的加密區段</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1840"/>
+        <location filename="../EMailHelper.cpp" line="1912"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
         <translation>加密區段必須恰好包含兩個部分；此區段包含 %1 個。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1856"/>
+        <location filename="../EMailHelper.cpp" line="1928"/>
         <source>Not everything is signed</source>
         <translation>並非所有內容均已簽署</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1857"/>
+        <location filename="../EMailHelper.cpp" line="1929"/>
         <source>%1 part(s) of this message sit outside the signature. They arrived unauthenticated and could have been added or changed by anyone in the path.</source>
         <translation>此訊息的 %1 個部分位於簽章之外。它們未經驗證送達，路徑上的任何人都可能新增或變更。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1871"/>
+        <location filename="../EMailHelper.cpp" line="1943"/>
         <source>Signature covers the encrypted data only</source>
         <translation>簽章僅涵蓋加密資料</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1872"/>
+        <location filename="../EMailHelper.cpp" line="1944"/>
         <source>This signature was made over the encrypted block, not over the message inside it. It shows who sent the ciphertext along; it does not say who wrote what you are reading, and anyone could have signed a copy of this same block.</source>
         <translation>此簽章是對加密區塊簽署，而非對其中的訊息簽署。它顯示誰傳送了密文；它並未說明你所閱讀內容的撰寫者是誰，且任何人都可能簽署同一個區塊的副本。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1903"/>
+        <location filename="../EMailHelper.cpp" line="1975"/>
         <source>Public key attached</source>
         <translation>已附加公鑰</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1904"/>
+        <location filename="../EMailHelper.cpp" line="1976"/>
         <source>This message carries %1 OpenPGP public key(s). A key arriving in a message proves nothing about who sent it: anyone can attach any key, including one they made for the name on the From line.</source>
         <translation>此訊息帶有 %1 個 OpenPGP 公鑰。訊息中附帶的金鑰無法證明寄件者身分：任何人都能附加任何金鑰，包括他們為寄件者欄位上的名稱所製作的金鑰。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1913"/>
+        <location filename="../EMailHelper.cpp" line="1985"/>
         <source>Detached signature attached</source>
         <translation>已附加分離式簽章</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1914"/>
+        <location filename="../EMailHelper.cpp" line="1986"/>
         <source>This message carries %1 signature file(s) that are not part of its own signed structure. Opening the message does not check them; they sign something else.</source>
         <translation>此訊息帶有 %1 個簽章檔，這些檔案不屬於其自身簽章結構的一部分。開啟訊息不會檢查它們；它們簽署的是其他內容。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1924"/>
+        <location filename="../EMailHelper.cpp" line="1996"/>
         <source>Blind recipients are visible</source>
         <translation>密件副本收件者可見</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1925"/>
+        <location filename="../EMailHelper.cpp" line="1997"/>
         <source>This message carries a Bcc header naming %1 recipient(s). Anyone who received it can see who was blind-copied.</source>
         <translation>此訊息帶有包含 %1 位收件者的 Bcc 標頭。任何收到此訊息的人都能看到誰被列入密件副本。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1941"/>
+        <location filename="../EMailHelper.cpp" line="2013"/>
         <source>Nothing is signed</source>
         <translation>未簽署任何內容</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1942"/>
+        <location filename="../EMailHelper.cpp" line="2014"/>
         <source>This message carries no signature, so the recipient cannot tell that it came from you or that it arrived unchanged.</source>
         <translation>此訊息沒有攜帶任何簽章，因此收件者無法確認它是否來自您，也無法確認它送達時是否未經更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1958"/>
+        <location filename="../EMailHelper.cpp" line="2030"/>
         <source>Some parts are not signed</source>
         <translation>有些部分未簽署</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1959"/>
+        <location filename="../EMailHelper.cpp" line="2031"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
         <translation>此訊息的 %1 個部分將在簽章未涵蓋的情況下寄出。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1968"/>
+        <location filename="../EMailHelper.cpp" line="2040"/>
         <source>Blind recipients</source>
         <translation>密件收件者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1969"/>
+        <location filename="../EMailHelper.cpp" line="2041"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
         <translation>加密將包含 %1 位密件收件者，但不會出現在訊息中的任何位置。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1976"/>
+        <location filename="../EMailHelper.cpp" line="2048"/>
         <source>Bcc header present</source>
         <translation>含有 Bcc 標頭</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1977"/>
+        <location filename="../EMailHelper.cpp" line="2049"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
         <translation>此訊息帶有 Bcc 標頭。寄出後會讓所有收件者知道密件副本收件者。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1985"/>
+        <location filename="../EMailHelper.cpp" line="2057"/>
         <source>Recipient may be disguised</source>
         <translation>收件者可能遭到偽裝</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1986"/>
+        <location filename="../EMailHelper.cpp" line="2058"/>
+        <source>The domain in &quot;%1&quot; uses characters that can be made to look like a different address. Check it before sending.</source>
+        <translation>「%1」中的網域使用了可被製成看似另一個地址的字元。寄出前請檢查。</translation>
+    </message>
+    <message>
         <source>The domain in &quot;%1&quot; uses characters that can be drawn to look like a different address. Check it before sending.</source>
-        <translation>「%1」中的網域使用了可被繪製成看似不同地址的字元。寄出前請檢查。</translation>
+        <translation type="vanished">「%1」中的網域使用了可被繪製成看似不同地址的字元。寄出前請檢查。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1993"/>
+        <location filename="../EMailHelper.cpp" line="2065"/>
         <source>No recipients</source>
         <translation>沒有收件者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1994"/>
+        <location filename="../EMailHelper.cpp" line="2066"/>
         <source>This message is not addressed to anyone.</source>
         <translation>此訊息沒有指定任何收件者。</translation>
     </message>
author	saturneric <[email protected]>	2026-09-13 18:52:01 +0200
committer	saturneric <[email protected]>	2026-09-13 18:52:01 +0200
commit	b21cc52db286ed33ee99374c28a5949b4f5dec38 (patch)
tree	fee9c162365a783771ae57b52a82d91fa67ff00c /src
parent	i18n(key-server): complete Russian translations (diff)
download	modules-b21cc52db286ed33ee99374c28a5949b4f5dec38.tar.gz modules-b21cc52db286ed33ee99374c28a5949b4f5dec38.zip