i18n(email): complete email translations

- translate email account, IMAP, security, and sending dialogs
- add strings for new signature and encryption states
- translate message editing, attachment, and validation feedback
- update source locations for changed email implementation lines

9 files changed, 8189 insertions, 6953 deletions

diff --git a/src/m_email/ts/ModuleEMail.de_DE.ts b/src/m_email/ts/ModuleEMail.de_DE.ts
index 04f0f52..66514af 100644
--- a/src/m_email/ts/ModuleEMail.de_DE.ts
+++ b/src/m_email/ts/ModuleEMail.de_DE.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (empfohlen)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine (nur dieser Rechner)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Optional</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeigename</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail-Adresse</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort an</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfang (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto zum Empfangen verwenden</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto zum Senden verwenden</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzername</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung testen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch ermittelt</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesendet-Ordner</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Als Standard festlegen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Konto, das beim Senden zuerst angeboten wird und verwendet wird, wenn nichts anderes ausgewählt ist.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Noch keine E-Mail-Konten</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Konto wird nur zum Abrufen und Senden von Nachrichten benötigt. Alles andere in GpgFrontend funktioniert ohne eines.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto hinzufügen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Leer lassen, um das gespeicherte Passwort zu behalten</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Anmeldung über die eigene Webseite eines Anbieters (OAuth2) wird noch nicht unterstützt. Falls Ihr Anbieter dies verlangt, erstellen Sie ein anwendungsspezifisches Passwort und verwenden Sie es hier.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail-Konten nicht gespeichert</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Konten wurden von einer neueren Version von GpgFrontend eingerichtet, daher hat diese Version sie nicht gelesen und nicht geändert.
+
+Ihre Konten sind weiterhin vorhanden. Verwenden Sie die neuere Version, um sie zu bearbeiten.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die gespeicherten E-Mail-Konten konnten nicht gelesen werden, daher hat diese Version sie nicht geändert.
+
+Es ist nichts verloren gegangen. Wenn dies weiterhin auftritt, muss die gespeicherte Liste möglicherweise von Hand entfernt werden.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbenanntes Konto</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (Standard)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto entfernen</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 entfernen?
+
+Das gespeicherte Passwort wird ebenfalls verworfen. Dies kann nicht rückgängig gemacht werden, sobald Sie in diesem Dialog OK drücken.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto benötigt eine E-Mail-Adresse.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; sieht nicht wie eine E-Mail-Adresse aus.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfang ist aktiviert, aber kein Server ist festgelegt.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden ist aktiviert, aber kein Server ist festgelegt.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivieren Sie Empfang, Senden oder beides. Ein Konto, das keines von beiden tut, kann nicht verwendet werden.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>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"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Port %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Einem Zertifikat vertrauen: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Vertrauen beenden&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Überprüfen Sie Benutzername und Passwort.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Überprüfen Sie die Serveradresse auf Tippfehler.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Adresse wird aufgelöst, aber es kam keine Antwort. Überprüfen Sie den Verbindungstyp und ob der Server von hier aus erreichbar ist.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Zertifikat des Servers ist nicht von einer Autorität signiert, der dieser Computer vertraut. Wenn Sie diesen Server selbst betreiben, können Sie wählen, seinem Zertifikat zu vertrauen.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Zertifikat des Servers ist abgelaufen oder noch nicht gültig. Überprüfen Sie zuerst die Uhr auf beiden Rechnern.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Zertifikat des Servers gilt für einen anderen Host. Überprüfen Sie die Serveradresse.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Server hat keine verschlüsselte Sitzung gestartet. Es wurde nichts an ihn gesendet.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die verschlüsselte Verbindung konnte nicht hergestellt werden.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Server antwortet nicht mehr. Versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies ist ein Fehler in GpgFrontend und nicht am Server.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies kann vorübergehend sein. Versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Server hat ein Zertifikat vorgelegt, für das keine Zertifizierungsstelle bürgt. Das ist normal für einen Server, den Sie selbst betreiben, und genau so sieht auch ein Abfangen aus.
+
+%1
+SHA-256: %2
+
+Diesem genauen Zertifikat für dieses Konto vertrauen? Jedes andere Zertifikat, auch ein späterer Ersatz dieses Zertifikats, wird weiterhin abgelehnt.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(keine Zertifikatsdetails)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesem Zertifikat vertrauen?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dem Zertifikat wird für dieses Konto vertraut. Testen Sie erneut, um zu bestätigen.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie zuerst eine Serveradresse ein.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie zuerst ein Passwort ein.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Teste...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestoppt.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erfolgreich verbunden.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung fehlgeschlagen, und der Grund ist unbekannt.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Header filtern</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur die Header anzeigen, deren Name oder Wert diesen Text enthält.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wert kopieren</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganzes Feld kopieren</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Nachricht ist geöffnet.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(fehlerhaft)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht hat keine anzuzeigenden Header.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP-Controller</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist noch kein E-Mail-Konto mit aktiviertem IMAP konfiguriert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein konfiguriertes Konto kann geöffnet werden. Überprüfen Sie die Einstellungen unter E-Mail-Konten.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP ist für dieses Konto deaktiviert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Server ist konfiguriert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Benutzername ist konfiguriert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Passwort ist gespeichert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto konnte nicht geöffnet werden: %1.
+
+Verwenden Sie Aktualisieren, um es erneut zu versuchen.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto kann nicht geöffnet werden: %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Betreff oder Absender suchen</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Ordner vom Server neu laden</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordner</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorherige</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Konto</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ordner</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Nächste</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie eine Nachricht aus, um ihre Details zu sehen.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganze Message-ID kopieren</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <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>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Betreff kopieren</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Absender kopieren</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID kopieren</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Kein Betreff)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>Diese Nachricht ist größer, als diese Anwendung öffnen kann, daher kann sie nicht importiert werden.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Angezeigt vom vorherigen Besuch dieses Kontos; wird aktualisiert.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche läuft...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachrichten werden geladen...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordner werden geladen...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Konto hat keine Ordner, die geöffnet werden können.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ersten %1 Treffer werden angezeigt; grenzen Sie die Suche ein, um weniger zu sehen.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Treffer.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Seite %1 von %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Ordner ist leer.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 von %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht war leer.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>In neuem Tab geöffnet.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht wird heruntergeladen, %1 von %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestoppt.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>das Passwort wurde abgelehnt</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>der Server wurde nicht gefunden</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>die sichere Verbindung wurde abgelehnt</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht wird heruntergeladen...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Absender</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Nachricht in diesem Ordner entspricht der Suche.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie einen Ordner, um die darin enthaltenen Nachrichten anzuzeigen.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,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="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ 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="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Digest der signierten MIME-Entität (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Deklarierter Signatur-Hash (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhänge</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>Verschlüsselungsempfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>Schlüssel-ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>verschlüsselt an</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>verschlüsselt an, nicht in den Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Versteckter Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Absender hat diese Schlüssel-ID nicht angegeben</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfängerprüfung</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>DETAILS</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>EMPFÄNGER</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>UNTERZEICHNER</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Vor dem Export prüfen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht enthält etwas, das vor dem Speichern geprüft werden sollte.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>E-Mail verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, ein OpenPGP-Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, nicht von der Signatur abgedeckt</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>in %1, aber nicht an ihn verschlüsselt: kann nicht gelesen werden</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>E-Mail entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>E-Mail signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>E-Mail verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>E-Mail verschlüsseln und signieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>E-Mail entschlüsseln und verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Datei speichern</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail-Nachricht (*.eml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei %1 kann nicht geschrieben werden:
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist keine gewöhnliche Datei und kann daher nicht als Nachricht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Datei %1 ist zu groß (%2), um geöffnet zu werden. Die maximal zulässige Größe beträgt %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Datei %1 kann nicht gelesen werden:
@@ -1095,428 +1118,427 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>Von:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc/Bcc</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>An:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bcc:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Betreff:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreiben Sie hier Ihre Nachricht.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen Sie die ausgewählten Anhänge aus dieser Nachricht.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist verschlüsselt. Entschlüsseln Sie sie vor dem Bearbeiten.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Rohquelle</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschützte Nachricht</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <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"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Bearbeitung beenden</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Rohquelle bearbeiten</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie bearbeiten die Rohquelle der Nachricht. Was Sie hier eingeben, ist das Dokument.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist zur Überprüfung gesperrt. Ihre Quelle kann nicht bearbeitet werden.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibgeschützt. Entsperren Sie, um die Nachrichtenquelle direkt zu bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist verschlüsselt und signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Empfänger werden in den Kopfzeilen nicht genannt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Adressiert an %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>öffentlichen Schlüssel anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>Text zu dieser Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht gesperrt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist nur zur Ansicht geöffnet, daher ist es nicht möglich, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entschlüsseln Sie diese Nachricht, bevor Sie versuchen, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <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="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie an, von wem diese Nachricht stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Absenderadresse sieht nicht wie eine E-Mail-Adresse aus.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügen Sie mindestens einen Empfänger hinzu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie dieser Nachricht einen Betreff.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies sieht nicht wie eine E-Mail-Adresse aus: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerhafte OpenPGP-Struktur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Weder signiert noch verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist zur Ansicht gesperrt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsseln...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsseln und Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturdetails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Erneut mit einem anderen Schlüssel signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur entfernen...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Entschlüsseln und Verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselungsdetails...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Details...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entschlüsseln Sie zuerst diese Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Was ist mit dieser Nachricht nicht in Ordnung?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Trotzdem verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Trotzdem entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur nicht erreichbar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <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="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Nichts zu entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht enthält keine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>Signatur von dieser Nachricht entfernen?
+
+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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>unsigniert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Nachricht</translation>
+        <translation>Nachricht</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Struktur</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Sicherheit</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachrichtendetails</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopfzeilen</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+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"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopie und Blindkopie anzeigen (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht anzeigen</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Rohes Dokument anzeigen</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine Antwort an den Absender schreiben.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Allen antworten</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiterleiten</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht mit ihren Anhängen weiterleiten.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Schreibgeschützt</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <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"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigen, was über diese Nachricht bekannt ist: ihre Signaturen, ihre Struktur und ihre Kopfzeilen.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Signiert</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei anhängen...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle speichern...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <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"/>
         <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>
+        <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"/>
         <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>
+        <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="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort an alle nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiterleiten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Nachricht selbst wurde nicht geändert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine Registerkarte für die neue Nachricht konnte nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <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="1890"/>
+        <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>
+        <translation>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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie besitzen den privaten Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie besitzen private Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Diese Nachricht ist signiert und kann daher nicht geändert werden: Eine Bearbeitung unter einer Signatur gilt als Fälschung.
+
+Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Verschlüsselt, Signatur nicht geprüft</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Signatur nicht geprüft</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Verschlüsselt, Signatur verifiziert</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Signatur verifiziert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Signiert von einer anderen Adresse</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Signatur oder Schlüssel abgelaufen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Signiert von einem unbekannten Schlüssel</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Ungültige Signatur</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>signiert, nicht geprüft</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>Signatur nicht gut</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 Anhang</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Anhänge</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail-Nachricht (*.eml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist ein Ordner</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 ist keine normale Datei</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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="2918"/>
+        <location filename="../EMailPageView.cpp" line="2999"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurde nichts angehängt:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Folgende wurden nicht angehängt:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel importieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Namen kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 ist keine Dateiart, die dieses Programm für Sie öffnen wird, da das Öffnen bedeuten würde, sie auszuführen oder an etwas zu übergeben, das dies möglicherweise tut.
+
+Speichern Sie sie stattdessen und öffnen Sie sie selbst, wenn Sie sicher sind, woher sie stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein temporärer Ordner zum Öffnen von %1 konnte nicht erstellt werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 konnte nicht zum Öffnen geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf diesem System ist nichts registriert, um %1 zu öffnen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus dieser Nachricht entfernen:
+
+%1
+
+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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Gespeichert. Einige Namen waren in diesem Ordner bereits vergeben, daher wurden diese unter einem anderen Namen geschrieben:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>1 Datei gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Dateien gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kann nicht geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhänge speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht schreiben: %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>verwendbar</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>läuft bald ab</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>abgelaufen</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>widerrufen</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>deaktiviert</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>gültig</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>gültig, mit Problemen</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>gültig, Schlüssel nicht vollständig vertrauenswürdig</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>ungültig</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>öffentlicher Schlüssel fehlt</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturschlüssel widerrufen</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur abgelaufen</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturschlüssel abgelaufen</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>Ungültige Signatur: Signaturschlüssel widerrufen</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>UNGÜLTIGE SIGNATUR: Sie stimmt nicht mit diesen Bytes überein</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>Gültig, aber von einer anderen Adresse signiert</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Element</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Detail</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Nachricht ist geöffnet.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wert kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Fingerabdruck kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel aus dieser Nachricht importieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Erneut verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>umfasst %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>umfasst %1, %2 Ebenen tief</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Ergebnis</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Abschnitt ist signiert, aber es wurde noch nichts verifiziert.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Unterzeichner</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Andere Adresse</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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="376"/>
+        <location filename="../EMailSecurityView.cpp" line="421"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Public-Key-Algorithmus</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Signiert am</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Deklarierter Hash (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur-Hash</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash-Abweichung</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Nachricht deklariert %1, aber die Signatur verwendete %2.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Warnung</translation>
+        <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>Adressiert und verschlüsselt an</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu dieser Nachricht gibt es nichts Weiteres zu berichten.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselt an, aber nicht in den sichtbaren Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Versteckter Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Absender hat nicht festgehalten, wer dies ist</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Fingerabdruck</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>in %1, aber nicht an ihn verschlüsselt: sie können dies nicht lesen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <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="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel für diese Adressen</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Schlüssel gefunden</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel ist %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Adresse befindet sich auf einer widerrufenen Benutzer-ID des Schlüssels.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>diese Adresse ist die primäre Benutzer-ID des Schlüssels</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>diese Adresse ist eine sekundäre Benutzer-ID des Schlüssels</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>dieser Schlüssel kann nicht zum Verschlüsseln verwendet werden</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Was auffällt</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist weder signiert noch verschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht enthält eine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist verschlüsselt.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist verschlüsselt und enthält eine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Diese Nachricht gibt an, OpenPGP zu verwenden, aber ihre Struktur entspricht nicht RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,283 +2323,284 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht senden</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(kein Betreff)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bereit zum Senden. Noch hat nichts diesen Computer verlassen.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Nachricht</translation>
+        <translation>Nachricht</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">Von</translation>
+        <translation>Von</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">An</translation>
+        <translation>An</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine sichtbaren Empfänger</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Blindkopien</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n Anhang
+%1, %n Anhänge</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Enthält</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden über</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Ergebnis</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Übermittlung</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopie im Gesendet-Ordner</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Port %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Details</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Details kopieren</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <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"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist kein ausgehendes Konto konfiguriert.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <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"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird gesendet. Dieses Fenster zeigt an, was passiert ist.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Für dieses Konto konnte kein Ordner „Gesendet“ identifiziert werden.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Kopie konnte nicht in das Postfach geschrieben werden.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Kopie konnte nicht in das Postfach geschrieben werden: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird gestoppt...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird noch gesendet</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht wird noch gesendet.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <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"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiter warten</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Trotzdem schließen</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Noch nicht gesendet</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <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"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja, vom ausgehenden Mailserver angenommen</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht gespeichert</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopie wird im Ordner „Gesendet“ gespeichert...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurde keine Kopie gespeichert.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Nachricht wurde gesendet, aber %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Postfach konnte nicht erreicht werden.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Postfach konnte nicht erreicht werden: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartet, bis die Nachricht gesendet ist.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja, Ihr Mailserver hatte es bereits in %1 abgelegt.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja, in %1 gespeichert.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Abgebrochen: Es wurde keine Kopie aufbewahrt. Die Nachricht wurde trotzdem gesendet.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es ist nicht bekannt, ob die Nachricht gesendet wurde.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>An den ausgehenden Mailserver übergeben.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht gesendet.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen (%1)</translation>
     </message>
 </context>
 <context>
@@ -2487,353 +2608,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Teil</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodierung</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Abgedeckt durch</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Nachricht geöffnet.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Teil speichern...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Schlüssel importieren</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-Type kopieren</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name kopieren</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 kopieren</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Teil speichern</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kann nicht geschrieben werden.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 dieses Teils: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>nicht abgedeckt</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP-Steuerteil</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein OpenPGP-Schlüssel, der importiert werden kann.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht hat keine anzuzeigenden Teile.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht enthält keinen signierten Abschnitt.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur %1 deckt %2 ab (angegeben %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>kein Algorithmus</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>Dieser Suchtext kann nicht gesendet werden.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Eine Suche darf nur gewöhnliche ASCII-Zeichen enthalten, ohne Zeilenumbrüche. Versuchen Sie, nach einem kürzeren Teil des Wortes zu suchen.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Diese Nachricht ist nicht mehr in diesem Ordner.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>Sie wurde verschoben oder gelöscht, nachdem diese Liste geladen wurde. Aktualisieren Sie den Ordner, um zu sehen, was sich jetzt dort befindet.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist zu groß zum Öffnen.</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>E-Mail-Editor</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <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="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP-Controller öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP-Controller-Dialog öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein E-Mail-Konto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurieren Sie zuerst ein E-Mail-Konto mit aktiviertem IMAP in den Einstellungen.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>Signierter Teil nicht mehr in kanonischer Form</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppelter %1-Header</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse möglicherweise verschleiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <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="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten gehen woandershin</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <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="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerhafter signierter Abschnitt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlerhafter verschlüsselter Abschnitt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein verschlüsselter Abschnitt muss genau zwei Teile enthalten; dieser enthält %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht alles ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Signatur umfasst nur die verschlüsselten Daten.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffentlicher Schlüssel angehängt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Abgetrennte Signatur angehängt</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Blindkopie-Empfänger sind sichtbar</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nichts ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Einige Teile sind nicht signiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Teil(e) dieser Nachricht würden versendet, ohne von der Signatur abgedeckt zu sein.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Blindkopie-Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <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="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>Bcc-Kopfzeile vorhanden</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfänger ist möglicherweise verschleiert</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>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="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Empfänger</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht ist an niemanden adressiert.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgestellt von: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Gültig für: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>NICHT gültig für %1: es nennt einen anderen Host</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Gültig von %1 bis %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.en_US.ts b/src/m_email/ts/ModuleEMail.en_US.ts
index fdce8b7..b78f43b 100644
--- a/src/m_email/ts/ModuleEMail.en_US.ts
+++ b/src/m_email/ts/ModuleEMail.en_US.ts
@@ -227,67 +227,67 @@ Its stored password is forgotten as well. This cannot be undone once you press O
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
@@ -297,47 +297,47 @@ Trust this exact certificate for this account? Any other certificate, including
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -484,7 +484,7 @@ Use Refresh to try again.</source>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -535,7 +535,7 @@ Use Refresh to try again.</source>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -565,103 +565,103 @@ Use Refresh to try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
@@ -669,7 +669,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -711,262 +711,271 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <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="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <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="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <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="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <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="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -1096,265 +1105,260 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <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="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <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="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1470,7 +1474,6 @@ Blind recipients are never written into the message: a Bcc header would tell eve
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1486,13 +1489,13 @@ Blind recipients are never written into the message: a Bcc header would tell eve
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1517,7 +1520,7 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,176 +1530,236 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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="1890"/>
+        <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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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="2640"/>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
@@ -1705,47 +1768,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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <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="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1824,258 +1887,283 @@ 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="153"/>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <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="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <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="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
@@ -2487,7 +2575,27 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2495,32 +2603,32 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <source>Open a new text editor for email.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2528,192 +2636,192 @@ This message came from somewhere else, so unless these have been saved already t
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <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="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <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="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <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="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</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 46bba4b..259e28d 100644
--- a/src/m_email/ts/ModuleEMail.es_ES.ts
+++ b/src/m_email/ts/ModuleEMail.es_ES.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (recomendado)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ninguno (solo esta máquina)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identidad</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcional</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre para mostrar</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>Dirección de correo electrónico</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder a</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Recepción (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Envío (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar esta cuenta para recibir</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar esta cuenta para enviar</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Conexión</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre de usuario</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Probar conexión</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Detectado automáticamente</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta de enviados</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Detener</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Establecer como predeterminado</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>La cuenta que se ofrece primero al enviar y la que se usa cuando no se elige ninguna otra.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Aún no hay cuentas de correo</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo se necesita una cuenta para recibir y enviar mensajes. Todo lo demás en GpgFrontend funciona sin una.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Añadir cuenta</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Déjalo en blanco para conservar la almacenada.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>El inicio de sesión a través de la propia página web del proveedor (OAuth2) aún no es compatible. Si su proveedor lo requiere, cree una contraseña específica de la aplicación y úsela aquí.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuentas de correo no guardadas</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Estas cuentas fueron configuradas por una versión más reciente de GpgFrontend, por lo que esta versión no las leyó ni las ha modificado.
+
+Sus cuentas siguen ahí. Use la versión más reciente para editarlas.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudieron leer las cuentas de correo almacenadas, por lo que esta versión no las ha modificado.
+
+No se ha perdido nada. Si esto sigue ocurriendo, puede ser necesario eliminar la lista almacenada manualmente.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuenta sin título</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (predeterminada)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar cuenta</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Eliminar %1?
+
+Su contraseña almacenada también se olvidará. Esto no se puede deshacer una vez que pulse Aceptar en este cuadro de diálogo.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta cuenta necesita una dirección de correo electrónico.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; no parece una dirección de correo electrónico.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>La recepción está activada, pero no se ha configurado ningún servidor.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>El envío está activado, pero no se ha configurado ningún servidor.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Active la recepción, el envío o ambos. Una cuenta que no haga ninguna de las dos cosas no se puede usar.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>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"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Puerto %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Confiando en un certificado: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Dejar de confiar en él&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Compruebe el nombre de usuario y la contraseña.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Compruebe la dirección del servidor por si tiene una errata.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>La dirección se resuelve, pero no hubo respuesta. Compruebe el tipo de conexión y si el servidor es accesible desde aquí.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>El certificado del servidor no está firmado por una autoridad en la que este equipo confía. Si usted mismo ejecuta este servidor, puede optar por confiar en su certificado.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>El certificado del servidor está caducado o aú no es válido. Compruebe el reloj de ambas máquinas antes de nada.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>El certificado del servidor corresponde a un host distinto. Compruebe la direción del servidor.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>El servidor no inició una sesión cifrada. No se le envió nada.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo establecer la conexión cifrada.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>El servidor dejó de responder. Inténtelo de nuevo.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esto es un fallo de GpgFrontend, no del servidor.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Puede ser temporal. Inténtelo de nuevo.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este servidor presentó un certificado que ningua autoridad avala. Eso es normal en un servidor que usted mismo ejecuta, y tamién es lo que parece una intercepción.
+
+%1
+SHA-256: %2
+
+¿Confía en este certificado exacto para esta cuenta? Cualquier otro certificado, incluido un reemplazo posterior de este, seguirá siendo rechazado.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sin detalles del certificado)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Confiar en este certificado?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certificado de confianza para esta cuenta. Vuelva a probar para confimar.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduzca primero una direción de servidor.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduzca una contraseña primero.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Probando...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detenido.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectado correctamente.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo conectar y se desconoce el motivo.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrar cabeceras</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar solo las cabeceras cuyo nombre o valor contenga este texto.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar valor</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar campo completo</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay ningún mensaje abierto.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(malformado)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no tiene cabeceras que mostrar.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aún no se ha configurado ninguna cuenta de correo con IMAP habilitado.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede abrir ninguna cuenta configurada. Compruebe la configuración, en Cuentas de correo.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP está desactivado para esta cuenta.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>no hay ningún servidor configurado</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>no hay ningún nombre de usuario configurado</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>no hay ninguna contraseña almacenada</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo abrir esta cuenta: %1.
+
+Use Actualizar para intentarlo de nuevo.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede abrir esta cuenta: %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscar asunto o remitente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Recargar esta carpeta desde el servidor</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpeta</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Anterior</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cuenta</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;arpeta</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Siguiente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione un mensaje para ver sus detalles.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar el Message-ID completo</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>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"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectando...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar asunto</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar remitente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sin asunto)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>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="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se muestra desde la visita anterior a esta cuenta; actualizando.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Ninguno</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargando mensajes...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargando carpetas...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta cuenta no tiene carpetas que se puedan abrir.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrando las primeras %1 coincidencias; restringe la búsqueda para ver menos.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 coincidencias.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Página %1 de %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta carpeta está vacía.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 de %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ese mensaje llegó vacío.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Abierto en una pestaña nueva.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargando mensaje, %1 de %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detenido.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>la contraseña fue rechazada</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>el servidor no se encontró</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>la conexión segura fue rechazada</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Descargando mensaje...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Remitente desconocido</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ningún mensaje en esta carpeta coincide con esa búsqueda.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elija una carpeta para ver los mensajes que contiene.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Detener</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,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="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>Correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ 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="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Resumen de la entidad MIME firmada (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash de firma declarado (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>Destinatario de cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>ID de clave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrado para</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrado para, no en las cabeceras</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario oculto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>el remitente ocultó este ID de clave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Verificación de destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>DETALLES</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Descifrar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>DESTINATARIO</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Verificar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>FIRMANTE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Comprobar antes de exportar</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hay algo en este mensaje que conviene comprobar antes de guardarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>Verificar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, una clave OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, no cubierta por la firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>en %1, pero no cifrado para ella: no se puede leer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>Descifrar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>Firmar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>Cifrar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Cifrar y firmar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Descifrar y verificar correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Guardar archivo</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje de correo electrónico (*.eml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede escribir el archivo %1:
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 no es un archivo ordinario, por lo que no se puede abrir como mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>El archivo %1 es demasiado grande (%2) para abrirse. El tamaño máximo permitido es %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>No se puede leer el archivo %1:
@@ -1095,428 +1118,427 @@ Si el problema persiste, considere buscar soporte técnico o consultar la docume
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>separe varias direcciones con &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>De:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc/Cco</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Para:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cco:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Asunto:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriba su mensaje aquí.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitar los archivos adjuntos seleccionados de este mensaje.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar los adjuntos seleccionados en una carpeta.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar cada adjunto en una carpeta.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está cifrado. Descífrelo antes de editarlo.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuente sin procesar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje protegido</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <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"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Dejar de editar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar fuente sin procesar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está bloquedo para inspección. Su fuete no se puede editar.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo lectura. Desbloquee para editar la fuete del mensaje directmente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Descifrar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está cifrado y firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Los destinatarios no se mencionan en las cabeceras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dirigido a %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>adjuntar una clave pública</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>añadir texto a este mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje bloqueado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está abierto solo para inspección, por lo que no es posible %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Descifre este mensaje antes de intentar %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <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="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indica quién envía este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La dirección del remitente no parece una dirección de correo electrónico.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Añade al menos un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pon un asunto a este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Esto no parece una dirección de correo electrónico: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Estructura OpenPGP malformada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>No firmado ni cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está bloqueado para inspección.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrar y firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Verificar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles de la firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Volver a firmar con otra clave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Descifrar y verificar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles del cifrado...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Descifre este mensaje primero.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Qué le pasa a este mensaje?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Intentar verificar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Intentar descifrar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma inaccesible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma está dentro de la parte cifrada de este mensaje. Descifre primero el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada que quitar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no lleva ninguna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede quitar la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>¿Quitar la firma de este mensaje?
+
+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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>sin firmar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede enviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje necesita un remitente y al menos un destinatario antes de poder enviarse.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Mensaje</translation>
+        <translation>Mensaje</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Estructura</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Seguridad</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles del mensaje</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabeceras</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+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"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar Cc y Cco (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar el mensaje</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar el documento sin procesar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Redactar una respuesta al remitente.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder a todos</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Reenviar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Reenviar este mensaje con sus adjuntos.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo lectura</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <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"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamaño</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmado</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Adjuntar archivo...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar todo...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <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"/>
         <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>
+        <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"/>
         <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>
+        <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="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede responder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede responder a todos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede reenviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje en sí no ha sido modificado.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo abrir una pestaña para el mensaje nuevo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <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="1890"/>
+        <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>
+        <translation>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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiene la clave privada de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiene claves privadas para %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Este mensaje está firmado, por lo que no se puede cambiar: una edición bajo una firma se interpreta como una falsificación.
+
+¿Quitar la firma y convertirlo en un mensaje normal?</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Cifrado, firma no comprobada.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Firma no comprobada</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Cifrado, firma verificada</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Firma verificada</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Firmado por una dirección diferente</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Firma o clave expirada</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Firmado por una clave desconocida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Firma incorrecta</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>firmado, no comprobado</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>firma no válida</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensaje de correo electrónico (*.eml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Adjuntar archivos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 es una carpeta</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 no es un archivo normal</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>No se adjuntó nada:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Estos archivos no se adjuntaron:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar clave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar nombre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 no es un tipo de archivo que este programa le vaya a abrir, porque abrirlo implicaría ejecutarlo o entregárselo a algo que pudiera ejecutarlo.
+
+Guárdelo en su lugar y ábralo usted mismo si está seguro de su procedencia.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo crear una carpeta temporal desde la que abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo escribir %1 para abrirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada en este sistema está registrado para abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quitar de este mensaje:
+
+%1
+
+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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardado. Algunos nombres ya estaban ocupados en esa carpeta, por lo que estos se guardaron con un nombre diferente:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se guardó 1 archivo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se guardaron %1 archivos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede escribir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo escribir: %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>Expira pronto</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Expirada</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>Revocada</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshabilitada</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconocida</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>Válida</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>Válida, con problemas</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>Válida, clave no totalmente confiable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>Inválida</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Falta la clave pública</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave de firma revocada</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>firma expirada</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>clave de firma expirada</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>firma inválida: clave de firma revocada</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>FIRMA INVÁLIDA: no coincide con estos bytes</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>válida, pero firmada por otra dirección</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Elemento</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalle</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay ningún mensaje abierto.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar valor</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar huella</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar dirección</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar la clave de este mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Verificar de nuevo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmas</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>cubre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>cubre %1, anidado %2 niveles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>esta sección está firmada, pero nada la ha verificado todavía</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmante desconocido</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Dirección diferente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Algoritmo de clave pública</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmado el</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash declarado (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash de la firma</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>El hash no coincide</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>el mensaje declara %1 pero la firma usó %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Advertencia</translation>
+        <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatarios</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>dirigido y cifrado a</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay nada más que informar sobre este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrado para, pero no en los encabezados visibles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario oculto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>el remitente optó por no indicar quién es</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Huella</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>en %1, pero no está cifrado para ella: no pueden leer esto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <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="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Claves para estas direcciones</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>no se encontró ninguna clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 claves</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>la clave es %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identidad</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>esta dirección está en un ID de usuario REVOCADO de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>esta dirección es el ID de usuario principal de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>esta dirección es un ID de usuario secundario de la clave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>esta clave no se puede usar para cifrar</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Lo que destaca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no está firmado ni cifrado.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está cifrado.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje está cifrado y contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Este mensaje afirma usar OpenPGP, pero su estructura no sigue el RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,283 +2323,284 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar mensaje</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sin asunto)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Listo para enviar. Nada ha salido de este equipo todavía.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Mensaje</translation>
+        <translation>Mensaje</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">De</translation>
+        <translation>De</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">Para</translation>
+        <translation>Para</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay destinatarios visibles</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Copias ocultas</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n archivo adjunto
+%1, %n archivos adjuntos</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar usando</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Envío</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia en Enviados</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 puerto %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Detener</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalles</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar detalles</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <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"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay ninguna cuenta de salida configurada.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <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"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviando. Esta ventana indicará lo que ha sucedido.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo identificar una carpeta de Enviados para esta cuenta.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo escribir la copia en el buzón.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo escribir la copia en el buzón: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Deteniendo...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Aún enviando</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje aún se está enviando.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <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"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Seguir esperando</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerrar de todos modos</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Aún no enviado</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviando...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <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"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Sí, aceptado por el servidor de correo saliente</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>No guardado</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardando una copia en Enviados...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se guardó ninguna copia.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>El mensaje se envió, pero %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo acceder al buzón.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>No se pudo acceder al buzón: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Espera hasta que el mensaje se envíe</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sí, su servidor de correo ya lo había archivado en %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sí, guardado en %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detenido: no se guardó ninguna copia. El mensaje se envió de todos modos.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se sabe si se envió.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entregado al servidor de correo saliente.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>No enviado.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerrar (%1)</translation>
     </message>
 </context>
 <context>
@@ -2487,353 +2608,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Parte</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamaño</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificación</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Cubierto por</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay ningún mensaje abierto.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar parte...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar esta clave</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar Content-Type</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar nombre</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar parte</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede escribir %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 de esta parte: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>firma %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>no cubierto</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>Parte de control OpenPGP</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Una clave OpenPGP, que se puede importar.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no tiene partes que mostrar.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no contiene ninguna sección firmada.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma %1 cubre %2 (declarado %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>sin algoritmo</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>No se puede enviar ese texto de búsqueda</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Una búsqueda solo puede contener caracteres ASCII ordinarios, sin saltos de línea. Intente buscar una parte más corta de la palabra.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Ese mensaje ya no está en esta carpeta</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>Se movió o se eliminó después de cargar esta lista. Actualice la carpeta para ver qué hay ahora.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ese mensaje es demasiado grande para abrirlo</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>Editor de correo electrónico</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <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="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir controlador IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir diálogo del controlador IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay cuenta de correo</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Configura primero una cuenta de correo con IMAP habilitado en Configuración.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>La parte firmada ya no está en forma canónica</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabecera %1 duplicada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>La dirección puede estar disfrazada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <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="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Las respuestas van a otra parte</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <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="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Sección firmada malformada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Sección cifrada malformada</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Una sección cifrada debe contener exactamente dos partes; esta contiene %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>No todo está firmado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma solo cubre los datos cifrados</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Clave pública adjunta</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma separada adjunta</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Los destinatarios ocultos son visibles</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada está firmado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Algunas partes no están firmadas</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 parte(s) de este mensaje saldrá(n) sin la cobertura de la firma.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatarios ocultos</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <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="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabecera Bcc presente</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>El destinatario podría estar suplantado</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin destinatarios</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este mensaje no está dirigido a nadie.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Emitido por: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Válido para: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>NO válido para %1: designa un host diferente</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Válido desde %1 hasta %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.fr_FR.ts b/src/m_email/ts/ModuleEMail.fr_FR.ts
index 1515aa2..6bf96dd 100644
--- a/src/m_email/ts/ModuleEMail.fr_FR.ts
+++ b/src/m_email/ts/ModuleEMail.fr_FR.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (recommandé)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun (cette machine uniquement)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identité</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Facultatif</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom affiché</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse e-mail</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Répondre à</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Réception (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoi (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser ce compte pour recevoir</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser ce compte pour envoyer</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serveur</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Tester la connexion</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Découvert automatiquement</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Dossier des éléments envoyés</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêter</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Définir par défaut</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le compte proposé en premier lors de l&apos;envoi, et celui utilisé lorsqu&apos;aucun autre n&apos;est choisi.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun compte de messagerie pour l&apos;instant</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Un compte n&apos;est nécessaire que pour récupérer et envoyer des messages. Tout le reste dans GpgFrontend fonctionne sans compte.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajouter un compte</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Mot de passe</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Laissez vide pour conserver celui qui est enregistré.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>La connexion via la page web du fournisseur (OAuth2) n&apos;est pas encore prise en charge. Si votre fournisseur l&apos;exige, créez un mot de passe spécifique à l&apos;application et utilisez-le ici.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Comptes de messagerie non enregistrés</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ces comptes ont été configurés par une version plus récente de GpgFrontend. Cette version ne les a donc pas lus et ne les a pas modifiés.
+
+Vos comptes sont toujours là. Utilisez la version plus récente pour les modifier.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>Les comptes de messagerie enregistrés n&apos;ont pas pu être lus. Cette version ne les a donc pas modifiés.
+
+Rien n&apos;a été perdu. Si cela se reproduit, la liste enregistrée devra peut-être être supprimée manuellement.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Compte sans titre</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (par défaut)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer le compte</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer %1 ?
+
+Son mot de passe enregistré sera également oublié. Cette action ne peut pas être annulée une fois que vous avez cliqué sur OK dans cette boîte de dialogue.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce compte nécessite une adresse e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>« %1 » ne ressemble pas à une adresse e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>La réception est activée mais aucun serveur n&apos;est configuré.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;envoi est activé mais aucun serveur n&apos;est configuré.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Activez la réception, l&apos;envoi ou les deux. Un compte qui ne fait ni l&apos;un ni l&apos;autre ne peut pas être utilisé.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>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"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Port %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Certificat approuvé : %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Cesser de lui faire confiance&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifiez le nom d&apos;utilisateur et le mot de passe.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifiez si l&apos;adresse du serveur contient une faute de frappe.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;adresse se résout mais rien n&apos;a répondu. Vérifiez le type de connexion et si le serveur est joignable depuis ici.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le certificat du serveur n&apos;est pas signé par une autorité à laquelle cet ordinateur fait confiance. Si vous exécutez ce serveur vous-même, vous pouvez choisir de faire confiance à son certificat.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le certificat du serveur est expiré ou pas encore valide. Vérifiez l&apos;horloge des deux machines avant toute autre chose.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le certificat du serveur est pour un hôte différent. Vérifiez l&apos;adresse du serveur.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le serveur n&apos;a pas démarré de session chiffrée. Rien ne lui a été envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>La connexion chiffrée n&apos;a pas pu être établie.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le serveur a cessé de répondre. Réessayez.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>C&apos;est un défaut de GpgFrontend plutôt que du serveur.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cela peut être temporaire. Réessayez.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce serveur a présenté un certificat qu&apos;aucune autorité ne cautionne. C&apos;est normal pour un serveur que vous gérez vous-même, et c&apos;est aussi à quoi ressemble une interception.
+
+%1
+SHA-256: %2
+
+Faire confiance à ce certificat exact pour ce compte ? Tout autre certificat, y compris un remplacement ultérieur de celui-ci, sera toujours refusé.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(aucun détail de certificat)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>Faire confiance à ce certificat ?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certificat approuvé pour ce compte. Testez à nouveau pour confirmer.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Saisissez d&apos;abord une adresse de serveur.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Saisissez d&apos;abord un mot de passe.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Test...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêté.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion réussie.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion impossible, raison inconnue.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrer les en-têtes</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher uniquement les en-têtes dont le nom ou la valeur contient ce texte.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valeur</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier la valeur</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier tout le champ</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun message n&apos;est ouvert.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(malformé)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message n&apos;a aucun en-tête à afficher.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Contrôleur IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun compte de messagerie avec IMAP activé n&apos;est encore configuré.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun compte configuré ne peut être ouvert. Vérifiez les paramètres, sous Comptes de messagerie.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP est désactivé pour ce compte</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>aucun serveur n&apos;est configuré</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>aucun nom d&apos;utilisateur n&apos;est configuré</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>aucun mot de passe n&apos;est stocké</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce compte n&apos;a pas pu être ouvert : %1.
+
+Utilisez Actualiser pour réessayer.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce compte ne peut pas être ouvert : %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechercher l&apos;objet ou l&apos;expéditeur</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Recharger ce dossier depuis le serveur</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Dossier</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Précédent</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Compte</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>D&amp;ossier</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Suivant</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sélectionnez un message pour voir ses détails.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le Message-ID en entier</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <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>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;objet</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;expéditeur</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sans objet)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></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="unfinished"></translation>
+        <translation>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="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Affichage de la dernière visite de ce compte ; actualisation en cours.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Recherche...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chargement des messages...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chargement des dossiers...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce compte n&apos;a aucun dossier pouvant être ouvert.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Affichage des %1 premières correspondances ; affinez la recherche pour en voir moins.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 correspondance(s).</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Page %1 sur %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce dossier est vide.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 sur %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est revenu vide.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvert dans un nouvel onglet.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Téléchargement du message, %1 sur %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêté.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>le mot de passe a été refusé</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>le serveur est introuvable</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>la connexion sécurisée a été refusée</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Téléchargement du message...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Expéditeur inconnu</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun message dans ce dossier ne correspond à cette recherche.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisissez un dossier pour voir les messages qu&apos;il contient.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêter</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,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="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>À</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>Cci</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ 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="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Empreinte de l&apos;entité MIME signée (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hachage de signature déclaré (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>Destinataire du chiffrement</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>Destinataire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>Identifiant de clé</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>chiffré pour</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>chiffré pour, absent des en-têtes</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinataire masqué</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>l&apos;expéditeur a masqué cet identifiant de clé</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérification du destinataire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>DÉTAILS</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Déchiffrer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>DESTINATAIRE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Signer</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>SIGNATAIRE</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier avant d&apos;exporter</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <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="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>Vérifier l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, une clé OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, non couvert par la signature</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>dans %1, mais pas chiffré pour elle : impossible à lire</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>Déchiffrer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>Signer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>Chiffrer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Chiffrer et signer l&apos;e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Enregistrer le fichier</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Message e-mail (*.eml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire le fichier %1 :
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <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="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le fichier %1 est trop volumineux (%2) pour être ouvert. La taille maximale autorisée est de %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Impossible de lire le fichier %1 :
@@ -1095,428 +1118,427 @@ Si le problème persiste, envisagez de contacter le support technique ou de cons
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>séparez plusieurs adresses par &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>De :</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc/Cci</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>À :</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc :</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cci :</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Objet :</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Écrivez votre message ici.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Retirez les pièces jointes sélectionnées de ce message.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer les pièces jointes sélectionnées dans un dossier.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer toutes les pièces jointes dans un dossier.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est chiffré. Déchiffrez-le avant de le modifier.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Source brute</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Message protégé</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <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"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêter la modification</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifier la source brute</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est verrouillé pour inspection. Sa source ne peut pas être modifiée.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture seule. Déverrouillez pour modifier directement la source du message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Déchiffrer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est chiffré et signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Les destinataires ne sont pas nommés dans les en-têtes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Adressé à %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>joindre une clé publique</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>ajouter du texte à ce message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Message verrouillé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <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="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Message chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Déchiffrez ce message avant d’essayer de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Message signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <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="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indiquez qui est l&apos;expéditeur de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;adresse « De » ne ressemble pas à une adresse e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajoutez au moins un destinataire.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Donnez un objet à ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ceci ne ressemble pas à une adresse e-mail : %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Structure OpenPGP malformée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Ni signé ni chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est verrouillé pour inspection.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiffrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiffrer et signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails de la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Signer à nouveau avec une autre clé...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Déchiffrer et vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails du chiffrement...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Déchiffrez d&apos;abord ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Qu&apos;est-ce qui ne va pas avec ce message ?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Essayer de vérifier quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Essayer de déchiffrer quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Signature inaccessible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <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="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Rien à supprimer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message ne comporte aucune signature.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>Supprimer la signature de ce message ?
+
+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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>non signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;envoyer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Message</translation>
+        <translation>Message</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Structure</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Sécurité</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails du message</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>En-têtes</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+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"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les champs Cc et Cci (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher le message</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher le document brut</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Répondre</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rédiger une réponse à l&apos;expéditeur.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Répondre à tous</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Transférer</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transmettre ce message avec ses pièces jointes.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Lecture seule</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <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"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Taille</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Signé</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Joindre un fichier...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Tout enregistrer...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <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"/>
         <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>
+        <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"/>
         <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>
+        <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="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de répondre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de répondre à tous</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de faire suivre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message lui-même n&apos;a pas été modifié.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;ouvrir un onglet pour le nouveau message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <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="1890"/>
+        <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>
+        <translation>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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vous détenez la clé privée pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vous détenez des clés privées pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Ce message est signé, il ne peut donc pas être modifié : une édition sous une signature apparaît comme un faux.
+
+Supprimer la signature et en faire un message ordinaire ?</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Chiffré, signature non vérifiée</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Signature non vérifiée</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Chiffré, signature vérifiée</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Signature vérifiée</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Signé par une adresse différente</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Signature ou clé expirée</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Signé par une clé inconnue</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Mauvaise signature</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>signé, non vérifié</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>signature non valide</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Message e-mail (*.eml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Joindre des fichiers</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 est un dossier</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <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="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 : %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Rien n&apos;a été joint :
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ces fichiers n&apos;ont pas été joints :
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer une clé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le nom</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 n&apos;est pas un type de fichier que ce programme peut ouvrir pour vous, car l&apos;ouvrir reviendrait à l&apos;exécuter ou à le confier à un programme qui pourrait le faire.
+
+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="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de créer un dossier temporaire pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 n&apos;a pas pu être écrit pour être ouvert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun programme de ce système n&apos;est enregistré pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Retirer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Retirer de ce message :
+
+%1
+
+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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistré. Certains noms étaient déjà pris dans ce dossier ; ces fichiers ont donc été enregistrés sous d&apos;autres noms :
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>1 fichier enregistré.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fichiers enregistrés.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer les pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire : %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>utilisable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>expire bientôt</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>expirée</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>révoquée</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>désactivée</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>inconnue</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>valide</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>valide, avec anomalies</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>valide, clé non entièrement fiable</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>invalide</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>clé publique manquante</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>clé de signature révoquée</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>signature expirée</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>clé de signature expirée</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>mauvaise signature : clé de signature révoquée</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>MAUVAISE SIGNATURE : elle ne correspond pas à ces octets</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>valide, mais signée par une autre adresse</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Élément</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Détail</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun message n&apos;est ouvert.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier la valeur</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;empreinte</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;adresse</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer la clé de ce message</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Vérifier à nouveau</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatures</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Signature %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>couvre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>couvre %1, imbriqué à %2 niveaux</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Résultat</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>cette section est signée, mais rien ne l&apos;a encore vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Signataire inconnu</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Adresse différente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Algorithme de clé publique</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Signé le</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash déclaré (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash de signature</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Incohérence de hash</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>le message déclare %1 mais la signature a utilisé %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Avertissement</translation>
+        <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinataires</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>adressé et chiffré à</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il n&apos;y a rien d&apos;autre à signaler à propos de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Clé %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>chiffré à, mais pas dans les en-têtes visibles</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinataire masqué</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>l&apos;expéditeur a choisi de ne pas indiquer de qui il s&apos;agit</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Empreinte</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>dans %1, mais pas chiffré à cette clé : ils ne peuvent pas lire ceci</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Remarque</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <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="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Clés pour ces adresses</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>aucune clé trouvée</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 clés</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>la clé est %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identité</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>cette adresse se trouve sur un ID utilisateur révoqué de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>cette adresse est l&apos;ID utilisateur principal de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>cette adresse est un ID utilisateur secondaire de la clé</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>cette clé ne peut pas être utilisée pour le chiffrement</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce qui ressort</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message n&apos;est ni signé ni chiffré.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message comporte une signature.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est chiffré.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est chiffré et comporte une signature.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Ce message prétend utiliser OpenPGP mais sa structure ne suit pas la RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,283 +2323,284 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer le message</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sans objet)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prêt à envoyer. Rien n&apos;a encore quitté cet ordinateur.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Message</translation>
+        <translation>Message</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">De</translation>
+        <translation>De</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">À</translation>
+        <translation>À</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun destinataire visible</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Copies cachées</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n pièce jointe
+%1, %n pièces jointes</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Contient</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer via</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Résultat</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Soumission</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Copie dans Envoyés</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 port %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêter</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier les détails</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <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"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyer</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annuler</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun compte sortant n’est configuré.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <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"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoi en cours. Cette fenêtre indiquera ce qui s&apos;est passé.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun dossier « Envoyés » n&apos;a pu être identifié pour ce compte.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrêt en cours...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Toujours en cours d&apos;envoi</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est toujours en cours d&apos;envoi.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <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"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Continuer à attendre</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer quand même</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas encore envoyé</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Envoi...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <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"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, accepté par le serveur de courrier sortant</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Non enregistré</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrement d&apos;une copie dans Envoyés...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucune copie n&apos;a été conservée.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Le message a été envoyé, mais %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de joindre la boîte aux lettres.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de joindre la boîte aux lettres : %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Attend que le message soit envoyé</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, votre serveur de messagerie l&apos;avait déjà classé dans %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Oui, enregistré dans %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>On ne sait pas si ce message a été envoyé.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transmis au serveur de messagerie sortant.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non envoyé.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Fermer (%1)</translation>
     </message>
 </context>
 <context>
@@ -2487,353 +2608,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Partie</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Taille</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Encodage</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Couvert par</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun message n&apos;est ouvert.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer la partie...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer cette clé</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le type de contenu</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier le nom</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer la partie</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible d&apos;écrire %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 de cette partie : %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>signature %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>non couvert</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>Partie de contrôle OpenPGP</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Une clé OpenPGP pouvant être importée.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID : %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message ne contient aucune partie à afficher.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message ne contient aucune section signée.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>La signature %1 couvre %2 (déclaré %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun algorithme</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>Ce texte de recherche ne peut pas être envoyé</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Une recherche ne peut contenir que des caractères ASCII ordinaires, sans saut de ligne. Essayez de rechercher une partie plus courte du mot.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Ce message n&apos;est plus dans ce dossier</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>Il a été déplacé ou supprimé après le chargement de cette liste. Actualisez le dossier pour voir ce qu&apos;il contient maintenant.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message est trop volumineux pour être ouvert</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>Éditeur de courriel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <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="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir le contrôleur IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir la boîte de dialogue du contrôleur IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun compte de courriel</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurez d&apos;abord un compte de courriel avec IMAP activé dans les paramètres.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>La partie signée n&apos;est plus sous forme canonique</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>En-tête %1 en double</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;adresse peut être déguisée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <translation>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="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Les réponses vont ailleurs</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <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="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Section signée malformée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Section chiffrée malformée</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Une section chiffrée doit contenir exactement deux parties ; celle-ci en contient %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Tout n&apos;est pas signé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>La signature ne couvre que les données chiffrées</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Clé publique jointe</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Signature détachée jointe</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Les destinataires en copie cachée sont visibles</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Rien n&apos;est signé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Certaines parties ne sont pas signées</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>La signature ne couvrira pas %1 partie(s) de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinataires cachés</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le chiffrement inclura %1 destinataire(s) caché(s), invisible(s) dans le message.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>En-tête Cci présent</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinataire possiblement déguisé</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun destinataire</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ce message n&apos;est adressé à personne.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Émis par : %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Valide pour : %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>NON valide pour %1 : il désigne un hôte différent</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Valide de %1 à %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.it_IT.ts b/src/m_email/ts/ModuleEMail.it_IT.ts
index fa99bb0..e452dae 100644
--- a/src/m_email/ts/ModuleEMail.it_IT.ts
+++ b/src/m_email/ts/ModuleEMail.it_IT.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (consigliato)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuno (solo questo computer)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identità</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Opzionale</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome visualizzato</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>Indirizzo email</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Rispondi a</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricezione (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Invio (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa questo account per ricevere</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa questo account per inviare</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome utente</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Test connessione</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Rilevato automaticamente</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartella inviati</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrompi</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Imposta come predefinito</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;account offerto per primo durante l&apos;invio e quello usato quando non viene scelto null&apos;altro.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account di posta ancora</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Un account è necessario solo per recuperare e inviare messaggi. Tutto il resto in GpgFrontend funziona senza.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi un account</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Lascia vuoto per mantenere quella salvata</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;accesso tramite la pagina web del provider (OAuth2) non è ancora supportato. Se il tuo provider lo richiede, crea una password specifica per l&apos;app e usala qui.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Account di posta non salvati</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questi account sono stati configurati da una versione più recente di GpgFrontend, quindi questa versione non li ha letti né modificati.
+
+I tuoi account ci sono ancora. Usa la versione più recente per modificarli.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile leggere gli account di posta memorizzati, quindi questa versione non li ha modificati.
+
+Non è andato perso nulla. Se il problema persiste, l&apos;elenco memorizzato potrebbe dover essere rimosso manualmente.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Account senza titolo</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (predefinito)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi account</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovere %1?
+
+Verra dimenticata anche la password memorizzata. Questa operazione non può essere annullata dopo aver premuto OK in questa finestra.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo account richiede un indirizzo e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; non sembra un indirizzo e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>La ricezione è attiva ma non è impostato alcun server.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;invio è attivo ma non è impostato alcun server.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Attiva la ricezione, l&apos;invio o entrambi. Un account che non fa né l&apos;uno né l&apos;altro non può essere utilizzato.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>Un altro account usa già questo indirizzo. Non è possibile distinguerli dove vengono offerti gli account.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Porta %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Stai dando fiducia a un certificato: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Smetti di fidarti&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlla il nome utente e la password.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlla l&apos;indirizzo del server per errori di battitura.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;indirizzo viene risolto, ma nessuno ha risposto. Controlla il tipo di connessione e se il server è raggiungibile da qui.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il certificato del server non è firmato da un&apos;autorità di cui questo computer si fida. Se gestisci tu questo server, puoi scegliere di fidarti del suo certificato.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il certificato del server è scaduto o non ancora valido. Controlla l&apos;orologio su entrambe le macchine prima di ogni altra cosa.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il certificato del server è per un host diverso. Controlla l&apos;indirizzo del server.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il server non ha avviato una sessione cifrata. Non è stato inviato nulla.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile stabilire la connessione cifrata.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il server ha smesso di rispondere. Riprova.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo è un difetto di GpgFrontend, non del server.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Potrebbe essere temporaneo. Riprova.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo server ha presentato un certificato per cui nessuna autorità si fa garante. È normale per un server che gestisci tu stesso, ed è anche così che appare un&apos;intercettazione.
+
+%1
+SHA-256: %2
+
+Vuoi fidarti di questo esatto certificato per questo account? Qualsiasi altro certificato, incluso un successivo sostituto di questo, sarà comunque rifiutato.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(nessun dettaglio del certificato)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>Fidarsi di questo certificato?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certificato considerato attendibile per questo account. Riprova per confermare.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci prima un indirizzo del server.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci prima una password.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Test in corso...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrotto.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Connesso con successo.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile connettersi e il motivo non è noto.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtra intestazioni</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra solo le intestazioni il cui nome o valore contiene questo testo.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valore</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia valore</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia l&apos;intero campo</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun messaggio è aperto.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(malformato)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non ha intestazioni da mostrare.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account di posta con IMAP abilitato è ancora configurato.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account configurato può essere aperto. Controlla le Impostazioni, in Account di posta.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP è disattivato per questo account</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>nessun server è configurato</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>nessun nome utente è configurato</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>nessuna password memorizzata</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile aprire questo account: %1.
+
+Usa Aggiorna per riprovare.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è possibile aprire questo account: %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerca per oggetto o mittente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricarica questa cartella dal server</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartella</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Precedente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Account</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cartella</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Successivo</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona un messaggio per vederne i dettagli.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia l&apos;intero Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>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"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione in corso...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia oggetto</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia mittente</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(nessun oggetto)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>Questo messaggio è più grande di quanto questa applicazione possa aprire, quindi non può essere importato.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrato dalla visita precedente a questo account; aggiornamento in corso.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuno</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca in corso...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Caricamento messaggi...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Caricamento cartelle...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo account non ha cartelle apribili.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizzati i primi %1 risultati; restringi la ricerca per vederne meno.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 risultati.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Pagina %1 di %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questa cartella è vuota.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 di %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio è risultato vuoto.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aperto in una nuova scheda.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scaricamento del messaggio, %1 di %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrotto.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>la password è stata rifiutata</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>il server non è stato trovato</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>la connessione sicura è stata rifiutata</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Download del messaggio...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Mittente sconosciuto</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun messaggio in questa cartella corrisponde alla ricerca.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli una cartella per vedere i messaggi al suo interno.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Ferma</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,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="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>Da</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Oggetto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ 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="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Digest dell&apos;entità MIME firmata (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash dichiarato della firma (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Allegati</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>Destinatario cifratura</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>ID chiave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrato per</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrato per, non nelle intestazioni</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario nascosto</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>il mittente non ha rivelato questo ID chiave</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Controllo destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Decifra</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifica</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>FIRMATARIO</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlla prima di esportare</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>C&apos;è qualcosa in questo messaggio che vale la pena controllare prima di salvarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>Verifica Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, una chiave OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, non coperta dalla firma</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>in %1, ma non cifrato per essa: impossibile leggere</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>Decifra Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>Firma Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>Cifra Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Cifra e firma Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Decifra e verifica Email</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Salva file</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio email (*.eml);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile scrivere il file %1:
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 non è un file ordinario, quindi non può essere aperto come messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il file %1 è troppo grande (%2) per essere aperto. La dimensione massima consentita è %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Impossibile leggere il file %1:
@@ -1095,428 +1118,427 @@ Se il problema persiste, si consiglia di contattare il supporto tecnico o consul
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>separare più indirizzi con &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>Da:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc/Ccn</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>A:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cc:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ccn:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oggetto:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Scrivi qui il tuo messaggio.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi gli allegati selezionati da questo messaggio.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva gli allegati selezionati in una cartella.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva tutti gli allegati in una cartella.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato. Decifralo prima di modificarlo.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato e firmato. Decifralo, quindi rimuovi la firma, prima di modificarlo.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Sorgente grezza</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio protetto</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <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"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrompi modifica</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica sorgente grezza</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stai modificando la sorgente grezza del messaggio. Quello che digiti qui è il documento.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è bloccato per ispezione. La sua sorgente non può essere modificata.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sola lettura. Sblocca per modificare direttamente la sorgente del messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Decifra</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato e firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>I destinatari non sono indicati nelle intestazioni.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>Allega una chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi testo a questo messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio bloccato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è aperto solo per ispezione, quindi non è possibile %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Decifra questo messaggio prima di provare a %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio è firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <translation>Questo messaggio non può comunque essere modificato: è firmato o cifrato, quindi è già protetto dalla riscrittura.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indica il mittente di questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;indirizzo del mittente non sembra un indirizzo e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi almeno un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Assegna un oggetto a questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo non sembra un indirizzo e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Struttura OpenPGP malformata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Né firmato né cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è bloccato per ispezione.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifra...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifra e firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifica firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Rifirma con un&apos;altra chiave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Decifra e verifica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli di cifratura...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Decifra prima questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Cosa c&apos;è che non va in questo messaggio?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Prova comunque a verificare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Prova comunque a decifrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma non raggiungibile</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma si trova nella parte cifrata di questo messaggio. Decifra prima il messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Nulla da rimuovere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non contiene alcuna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile rimuovere la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>Rimuovere la firma da questo messaggio?
+
+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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>non firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile inviare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio richiede un mittente e almeno un destinatario prima di poter essere inviato.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Messaggio</translation>
+        <translation>Messaggio</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Struttura</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Sicurezza</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli del messaggio</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Intestazioni</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+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"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra copia conoscenza e copia conoscenza nascosta (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il messaggio</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il documento grezzo</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Rispondi</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Scrivi una risposta al mittente.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Rispondi a tutti</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Inoltra</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inoltra questo messaggio, con i relativi allegati.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Sola lettura</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <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"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensione</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmato</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Allega file...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva tutti...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <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"/>
         <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>
+        <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"/>
         <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>
+        <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="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile rispondere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile rispondere a tutti</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile inoltrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio stesso non è stato modificato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile aprire una scheda per il nuovo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <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="1890"/>
+        <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>
+        <translation>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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Possiedi la chiave privata per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Possiedi chiavi private per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Questo messaggio è firmato, quindi non può essere modificato: una modifica sotto una firma viene letta come un falso.
+
+Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Cifrato, firma non verificata</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Firma non verificata</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Cifrato, firma verificata</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Firma verificata</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Firmato da un indirizzo diverso</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Firma o chiave scaduta</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Firmato da una chiave sconosciuta</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Firma errata</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>firmato, non verificato</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>firma non valida</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio e-mail (*.eml);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Allega file</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 è una cartella</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 non è un file ordinario</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato allegato nulla:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Questi non sono stati allegati:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importa chiave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia nome</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 non è un tipo di file che questo programma aprirà per te, perché aprirlo significherebbe eseguirlo o passarlo a qualcosa che potrebbe farlo.
+
+Salvalo invece e aprilo tu stesso se sei sicuro della sua provenienza.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile creare una cartella temporanea da cui aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato possibile scrivere %1 per aprirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun programma su questo sistema è registrato per aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi da questo messaggio:
+
+%1
+
+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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvati. Alcuni nomi erano già presenti in quella cartella, quindi questi sono stati scritti con un nome diverso:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvato 1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvati %1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile scrivere %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile scrivere: %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>utilizzabile</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>in scadenza</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>scaduto</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>revocato</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>disabilitato</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>sconosciuto</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>valido</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>valido, con problemi</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>valido, chiave non completamente attendibile</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>non valido</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>chiave pubblica mancante</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>chiave di firma revocata</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>firma scaduta</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>chiave di firma scaduta</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>firma non valida: chiave di firma revocata</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>FIRMA NON VALIDA: non corrisponde a questi byte</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>valida, ma firmata da un altro indirizzo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Elemento</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettaglio</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun messaggio è aperto.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia valore</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia impronta digitale</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia indirizzo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Importa la chiave da questo messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifica di nuovo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Firme</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>copre %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>copre %1, annidata a profondità %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Risultato</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>questa sezione è firmata, ma non è stata ancora verificata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmatario sconosciuto</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Indirizzo diverso</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Algoritmo a chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Firmato il</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash dichiarato (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash della firma</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Hash non corrispondente</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>il messaggio dichiara %1 ma la firma ha usato %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Avviso</translation>
+        <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatari</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>indirizzato e cifrato a</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non c&apos;è altro da segnalare su questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiave %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>cifrato a, ma non nelle intestazioni visibili</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatario nascosto</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>il mittente ha scelto di non indicare chi è</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Impronta digitale</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>in %1, ma non cifrato per esso: non possono leggerlo</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <translation>il motore ha riportato la chiave primaria invece della sottochiave di cifratura effettivamente utilizzata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiavi per questi indirizzi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>nessuna chiave trovata</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 chiavi</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>la chiave è %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Identità</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>questo indirizzo si trova su un ID utente REVOCATO della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>questo indirizzo è l&apos;ID utente primario della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>questo indirizzo è un ID utente secondario della chiave</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>questa chiave non può essere utilizzata per la cifratura</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Cosa spicca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non è firmato né cifrato.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è cifrato e contiene una firma.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Questo messaggio dichiara di usare OpenPGP, ma la sua struttura non segue la RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,283 +2323,284 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia messaggio</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(nessun oggetto)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pronto per l&apos;invio. Nessun dato ha ancora lasciato questo computer.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Messaggio</translation>
+        <translation>Messaggio</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">Da</translation>
+        <translation>Da</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">A</translation>
+        <translation>A</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun destinatario visibile.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Copie nascoste</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n allegato
+%1, %n allegati</numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia tramite</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Risultato</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Invio</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia in Inviati</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 porta %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrompi</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Dettagli</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia dettagli</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <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"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annulla</translation>
+        <translation>Annulla</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account di posta in uscita è configurato.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <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"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Invio in corso. Questa finestra mostrerà cosa è successo.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>non è stato possibile identificare alcuna cartella Inviati per questo account.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>non è stato possibile scrivere la copia nella casella di posta.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>non è stato possibile scrivere la copia nella casella di posta: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Arresto...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Invio ancora in corso</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio è ancora in fase di invio.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <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"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Attendi ancora</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi comunque</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Non ancora inviato</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Invio in corso...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <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"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Sì, accettato dal server di posta in uscita</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Non salvato</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvataggio di una copia in Inviati...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuna copia è stata conservata.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio è stato inviato, ma %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile raggiungere la casella di posta.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile raggiungere la casella di posta: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Attende che il messaggio venga inviato</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sì, il server di posta l&apos;ha già archiviata in %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sì, salvata in %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Interrotto: nessuna copia è stata conservata. Il messaggio è stato comunque inviato.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è noto se sia stato inviato.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Consegnato al server di posta in uscita.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non inviato.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi (%1)</translation>
     </message>
 </context>
 <context>
@@ -2487,353 +2608,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Parte</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensione</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codifica</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Coperto da</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun messaggio è aperto.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva parte...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importa questa chiave</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia Content-Type</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia nome</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva parte</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile scrivere %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 di questa parte: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>firma %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>non coperta</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>Parte di controllo OpenPGP</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Una chiave OpenPGP che può essere importata.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non ha parti da visualizzare.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non contiene sezioni firmate.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma %1 copre %2 (dichiarato %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>nessun algoritmo</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>Il testo di ricerca non può essere inviato</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Una ricerca può contenere solo caratteri ASCII ordinari, senza interruzioni di riga. Prova a cercare una parte più breve della parola.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Quel messaggio non è più in questa cartella</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>È stato spostato o eliminato dopo il caricamento di questo elenco. Aggiorna la cartella per vedere cosa c&apos;è ora.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Quel messaggio è troppo grande per essere aperto</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>Editor di posta</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <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="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri Controller IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri il dialogo Controller IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account di posta</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Configura prima un account di posta con IMAP abilitato nelle Impostazioni.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>La parte firmata non è più nella forma canonica</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>Intestazione %1 duplicata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;indirizzo potrebbe essere camuffato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <translation>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="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Le risposte vanno altrove</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <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="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Sezione firmata malformata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Sezione cifrata malformata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Una sezione cifrata deve contenere esattamente due parti; questa ne contiene %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Non tutto è firmato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma copre solo i dati cifrati</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiave pubblica allegata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma separata allegata</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>I destinatari in copia nascosta sono visibili</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nulla è firmato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Alcune parti non sono firmate</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>La firma non coprirebbe %1 parte/i di questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinatari nascosti</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>La cifratura includerà %1 destinatario/i in copia nascosta, che non compariranno nel messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>Intestazione Bcc presente</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Il destinatario potrebbe essere camuffato</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>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="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun destinatario</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo messaggio non è indirizzato a nessuno.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Rilasciato da: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Valido per: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>NON valido per %1: nomina un host diverso</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Valido da %1 a %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.pl_PL.ts b/src/m_email/ts/ModuleEMail.pl_PL.ts
index 1396199..7337f1c 100644
--- a/src/m_email/ts/ModuleEMail.pl_PL.ts
+++ b/src/m_email/ts/ModuleEMail.pl_PL.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (zalecane)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak (tylko ten komputer)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tożsamość</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcjonalne</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa wyświetlana</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres e-mail</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedź do</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbieranie (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysyłanie (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Użyj tego konta do odbierania</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Użyj tego konta do wysyłania</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Połączenie</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa użytkownika</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Testuj połączenie</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykrywane automatycznie</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Folder wysłanych</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw jako domyślne</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto oferowane jako pierwsze podczas wysyłania oraz używane, gdy nie wybrano żadnego innego.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak jeszcze kont pocztowych</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto jest potrzebne tylko do pobierania i wysyłania wiadomości. Wszystko inne w GpgFrontend działa bez niego.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj konto</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Hasło</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozostaw puste, aby zachować zapisane</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Logowanie przez stronę internetową dostawcy (OAuth2) nie jest jeszcze obsługiwane. Jeśli Twój dostawca tego wymaga, utwórz hasło specyficzne dla aplikacji i użyj go tutaj.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Konta pocztowe nie zostały zapisane</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Te konta zostały skonfigurowane przez nowszą wersję GpgFrontend, więc ta wersja nie odczytała ich i nie zmieniła ich.
+
+Twoje konta nadal istnieją. Użyj nowszej wersji, aby je edytować.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisane konta pocztowe nie mogły zostać odczytane, więc ta wersja nie zmieniła ich.
+
+Nic nie zostało utracone. Jeśli to się powtarza, zapisana lista może wymagać ręcznego usunięcia.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Konto bez nazwy</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (domyślne)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń konto</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usunąć %1?
+
+Zapisane hasło również zostanie zapomniane. Tej operacji nie można cofnąć po naciśnięciu OK w tym oknie.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>To konto wymaga adresu e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; nie wygląda na adres e-mail.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbieranie jest włączone, ale nie ustawiono serwera.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysyłanie jest włączone, ale nie ustawiono serwera.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Włącz odbieranie, wysyłanie lub oba. Konto, które nie robi żadnego z nich, nie może być używane.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>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"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Port %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Ufasz jednemu certyfikatowi: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Przestań mu ufać&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprawdź nazwę użytkownika i hasło.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprawdź, czy adres serwera nie zawiera literówki.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres jest rozwiązywany, ale nikt nie odpowiedział. Sprawdź typ połączenia i czy serwer jest osiągalny z tego miejsca.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certyfikat serwera nie jest podpisany przez autorytet, któremu ten komputer ufa. Jeśli sam prowadzisz ten serwer, możesz wybrać zaufanie do jego certyfikatu.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certyfikat serwera wygasł lub nie jest jeszcze ważny. Najpierw sprawdź zegar na obu maszynach.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certyfikat serwera dotyczy innego hosta. Sprawdź adres serwera.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer nie chciał rozpocząć szyfrowanej sesji. Nic do niego nie wysłano.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udało się nawiązać szyfrowanego połączenia.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer przestał odpowiadać. Spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>To błąd w GpgFrontend, a nie w serwerze.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>To może być przejściowe. Spróbuj ponownie.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten serwer przedstawił certyfikat, za który nie ręczy żaden urząd certyfikacji. To normalne w przypadku serwera, który prowadzisz sam, ale tak też wygląda przechwycenie.
+
+%1
+SHA-256: %2
+
+Zaufać temu konkretnemu certyfikatowi dla tego konta? Każdy inny certyfikat, w tym późniejszy zamiennik tego, nadal będzie odrzucany.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak szczegółów certyfikatu)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaufać temu certyfikatowi?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Certyfikat jest zaufany dla tego konta. Przetestuj ponownie, aby potwierdzić.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw wprowadź adres serwera.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw wprowadź hasło.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Testowanie...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymano.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Połączono pomyślnie.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udało się połączyć, a przyczyna nie jest znana.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtruj nagłówki</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż tylko nagłówki, których nazwa lub wartość zawiera ten tekst.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartość</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj wartość</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj całe pole</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie otwarto żadnej wiadomości.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(uszkodzony)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie ma nagłówków do wyświetlenia.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontroler IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie skonfigurowano jeszcze żadnego konta pocztowego z włączonym IMAP.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można otworzyć żadnego skonfigurowanego konta. Sprawdź ustawienia, w sekcji Konta pocztowe.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP jest wyłączony dla tego konta</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>nie skonfigurowano serwera</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>nie skonfigurowano nazwy użytkownika</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>nie zapisano hasła</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było otworzyć tego konta: %1.
+
+Użyj opcji Odśwież, aby spróbować ponownie.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można otworzyć tego konta: %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukaj tematu lub nadawcy</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Wczytaj ponownie ten folder z serwera</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Folder</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Poprzedni</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Konto</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>F&amp;older</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Następny</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz wiadomość, aby zobaczyć jej szczegóły.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Skopiuj cały identyfikator Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <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>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Łączenie...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj temat</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj nadawcę</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak tematu)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>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="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazano z poprzedniej wizyty na tym koncie; odświeżanie.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wczytywanie wiadomości...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wczytywanie folderów...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>To konto nie ma folderów, które można otworzyć.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyświetlanie pierwszych %1 dopasowań; zawęź wyszukiwanie, aby zobaczyć mniej.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 dopasowań.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Strona %1 z %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten folder jest pusty.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 z %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość wróciła pusta.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwarto w nowej karcie.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobieranie wiadomości, %1 z %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymano.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>hasło zostało odrzucone</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>nie znaleziono serwera</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>odrzucono bezpieczne połączenie</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobieranie wiadomości...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany nadawca</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Żadna wiadomość w tym folderze nie pasuje do wyszukiwania.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz folder, aby zobaczyć znajdujące się w nim wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj</translation>
     </message>
 </context>
 <context>
@@ -736,60 +749,60 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>E-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Temat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>DW</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>UDW</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -802,106 +815,106 @@ Use Refresh to try again.</source>
         <translation type="vanished">Algorytm kontroli integralności wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrót podpisanej jednostki MIME (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadeklarowany skrót podpisu (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Załączniki</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>Adresat szyfrowania</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>Adresat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>Identyfikator klucza</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>zaszyfrowano do</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>zaszyfrowano do, nie w nagłówkach</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryty adresat</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>nadawca nie ujawnił tego identyfikatora klucza</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprawdzanie adresata</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>SZCZEGÓŁY</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Odszyfruj</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>ADRESAT</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisz</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Zweryfikuj</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisujący</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprawdź przed eksportem</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Coś w tej wiadomości warto sprawdzić przed jej zapisaniem.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -932,7 +945,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="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -975,102 +988,112 @@ 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="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <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="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>Zweryfikuj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, klucz OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, nieobjęty podpisem</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>w %1, ale niezaszyfrowany do niego: nie można odczytać</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>Odszyfruj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>Podpisz e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>Zaszyfruj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>Zaszyfruj i podpisz e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>Odszyfruj i zweryfikuj e-mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Zapisz plik</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość e-mail (*.eml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać pliku %1:
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <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="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik %1 jest zbyt duży, aby go otworzyć (%2). Maksymalny dozwolony rozmiar to %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Nie można odczytać pliku %1:
@@ -1095,428 +1118,427 @@ Jeśli problem będzie się powtarzać, rozważ skorzystanie z pomocy techniczne
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>oddziel kilka adresów średnikiem &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>Od:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>DW/UDW</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Do:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>DW:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>UDW:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Temat:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij tę wiadomość przez skonfigurowane konto pocztowe.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="789"/>
         <location filename="../EMailPageView.cpp" line="1266"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tutaj swoją wiadomość.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń zaznaczone załączniki z tej wiadomości.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wybrane załączniki do folderu.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wszystkie załączniki do folderu.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zaszyfrowana. Odszyfruj ją przed edycją.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Surowe źródło</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Zabezpieczona wiadomość</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <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"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakończ edycję</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj surowe źródło</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytujesz surowe źródło wiadomości. To, co tu wpisujesz, jest dokumentem.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tylko do odczytu. Odblokuj, aby bezpośrednio edytować źródło wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Odszyfruj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zaszyfrowana i podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbiorcy nie są wymienieni w nagłówkach.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresowana do %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>dołącz klucz publiczny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>dodaj tekst do tej wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość zablokowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest otwarta tylko do podglądu, więc nie można %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odszyfruj tę wiadomość, zanim spróbujesz %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość jest podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <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="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <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="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <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="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzupełnij, od kogo pochodzi ta wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres nadawcy nie wygląda na adres e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj co najmniej jednego odbiorcę.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nadaj tej wiadomości temat.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>To nie wygląda na adres e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaszyfrowane</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprawidłowa struktura OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie podpisano ani nie zaszyfrowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zablokowana do wglądu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szyfruj...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szyfruj i podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Weryfikuj podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły podpisu...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisz ponownie innym kluczem...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń podpis...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Odszyfruj i zweryfikuj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły szyfrowania...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw odszyfruj tę wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Co jest nie tak z tą wiadomością?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Spróbuj mimo wszystko zweryfikować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Spróbuj mimo wszystko odszyfrować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpis nieosiągalny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpis znajduje się w zaszyfrowanej części tej wiadomości. Najpierw ją odszyfruj.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie ma czego usunąć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie zawiera podpisu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można usunąć podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <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="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>Usunąć podpis z tej wiadomości?
+
+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="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>niepodpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można wysłać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Wiadomość</translation>
+        <translation>Wiadomość</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Struktura</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Bezpieczeństwo</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły wiadomości</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Nagłówki</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+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"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż DW i UDW (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż wiadomość</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż surowy dokument</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Napisz odpowiedź do nadawcy.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz wszystkim</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Przekaż</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Przekaż tę wiadomość wraz z załącznikami.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Tylko do odczytu</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <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"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż, co wiadomo o tej wiadomości: jej podpisy, strukturę i nagłówki.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisano</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Załącz plik...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wszystko...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <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"/>
         <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>
+        <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"/>
         <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>
+        <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="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można odpowiedzieć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można odpowiedzieć wszystkim</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można przekazać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sama wiadomość nie została zmieniona.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <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="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <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="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było otworzyć karty dla nowej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <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="1890"/>
+        <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>
+        <translation>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="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <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="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Posiadasz klucz prywatny dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Posiadasz klucze prywatne dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Ta wiadomość jest podpisana, więc nie można jej zmienić: edycja pod podpisem jest odczytywana jako fałszerstwo.
+
+Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Zaszyfrowano, podpis nie sprawdzony</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Podpis niezweryfikowany</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Zaszyfrowano, podpis zweryfikowano</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Podpis zweryfikowano</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Podpisano innym adresem</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Podpis lub klucz wygasł</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Podpisano nieznanym kluczem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Nieprawidłowy podpis</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>podpisany, niezweryfikowany</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>podpis nieprawidłowy</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <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="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Załączniki: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość e-mail (*.eml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Załącz pliki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 to folder</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 nie jest zwykłym plikiem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nic nie zostało załączone:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie załączono tych plików:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuj klucz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj nazwę</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 nie jest rodzajem pliku, który ten program otworzy za Ciebie, ponieważ otwarcie go oznaczałoby uruchomienie go lub przekazanie go czemuś, co mogłoby to zrobić.
+
+Zapisz go zamiast tego i otwórz sam, jeśli masz pewność, skąd pochodzi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było utworzyć folderu tymczasowego do otwarcia %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było zapisać %1, aby go otworzyć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nic w tym systemie nie jest zarejestrowane do otwierania %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuń z tej wiadomości:
+
+%1
+
+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="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisano. Niektóre nazwy były już zajęte w tym folderze, więc zapisano je pod inną nazwą:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisano 1 plik.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisano %1 plików.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz załączniki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać: %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>używalny</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>wkrótce wygaśnie</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>wygasł</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>unieważniony</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>wyłączony</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>nieznany</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>ważny</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>ważny, z problemami</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>ważny, klucz nie w pełni zaufany</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>nieważny</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>brak klucza publicznego</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>klucz podpisujący unieważniony</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>podpis wygasł</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>klucz podpisujący wygasł</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>błędny podpis: klucz podpisujący unieważniony</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>BŁĘDNY PODPIS: nie pasuje do tych bajtów</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>prawidłowy, ale podpisany przez inny adres</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Element</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie otwarto żadnej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj wartość</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj odcisk klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj adres</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuj klucz z tej wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Zweryfikuj ponownie</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpis %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>obejmuje %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>obejmuje %1, zagnieżdżone %2 poziomów</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Wynik</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta sekcja jest podpisana, ale nic jeszcze jej nie zweryfikowało.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <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="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany podpisujący</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Inny adres</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Algorytm klucza publicznego</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisano dnia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadeklarowany algorytm skrótu (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Algorytm skrótu podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Niezgodność algorytmu skrótu</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość deklaruje %1, ale w podpisie użyto %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Ostrzeżenie</translation>
+        <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbiorcy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>zaadresowano i zaszyfrowano do</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak dalszych informacji o tej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucz %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>zaszyfrowano do, ale nie w widocznych nagłówkach</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryty odbiorca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>nadawca nie zapisał, kim jest ten odbiorca</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Odcisk klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>w %1, ale nie jest do niego zaszyfrowana: nie mogą tego odczytać</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Uwaga</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <translation>silnik podał klucz główny zamiast faktycznie użytego podklucza szyfrującego</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucze dla tych adresów</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>nie znaleziono klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 klucz</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kluczy</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucz: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tożsamość</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>ten adres należy do UNIEWAŻNIONEGO identyfikatora użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>ten adres jest głównym identyfikatorem użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>ten adres jest dodatkowym identyfikatorem użytkownika klucza</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>tego klucza nie można użyć do szyfrowania</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Co się wyróżnia</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie jest podpisana ani zaszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość zawiera podpis.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zaszyfrowana.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zaszyfrowana i zawiera podpis.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Ta wiadomość deklaruje użycie OpenPGP, ale jej struktura nie jest zgodna z RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,48 +2323,50 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij wiadomość</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak tematu)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gotowe do wysłania. Nic nie opuściło jeszcze tego komputera.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Wiadomość</translation>
+        <translation>Wiadomość</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">Od</translation>
+        <translation>Od</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak widocznych odbiorców</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryte kopie</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n załącznik
+%1, %n załączniki
+%1, %n załączników</numerusform>
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
@@ -2252,235 +2374,235 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawiera</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij przez</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Wynik</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysyłka</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopia w wysłanych</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 port %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegóły</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj szczegóły</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <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"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyślij</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Anuluj</translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie skonfigurowano konta poczty wychodzącej.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <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"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysyłanie. To okno pokaże, co się stało.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <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>
+        <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"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było zidentyfikować folderu Wysłane dla tego konta.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>nie można było zapisać kopii do skrzynki pocztowej.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>nie można było zapisać kopii do skrzynki pocztowej: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymywanie...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Nadal wysyłanie</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest nadal wysyłana.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <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"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Czekaj dalej</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij mimo to</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Jeszcze nie wysłano</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysyłanie...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <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"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak, zaakceptowana przez serwer poczty wychodzącej</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zapisano</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisywanie kopii w folderze Wysłane...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zachowano kopii.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomość została wysłana, ale %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <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"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było uzyskać dostępu do skrzynki pocztowej.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można było uzyskać dostępu do skrzynki pocztowej: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Czeka, aż wiadomość zostanie wysłana</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak, Twój serwer pocztowy już zapisał ją w %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak, zapisano w %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymano: nie zachowano kopii. Wiadomość mimo to została wysłana.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie wiadomo, czy wiadomość została wysłana.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Przekazano serwerowi poczty wychodzącej.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie wysłano.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij (%1)</translation>
     </message>
 </context>
 <context>
@@ -2488,353 +2610,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Część</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodowanie</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokryte przez</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie otwarto żadnej wiadomości.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz część...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuj ten klucz</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj typ zawartości</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj nazwę</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz część</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można zapisać %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 tej części: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>podpis %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>nieobjęte</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>Część kontrolna OpenPGP</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucz OpenPGP, który można zaimportować.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie ma części do wyświetlenia.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie zawiera podpisanej sekcji.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpis %1 obejmuje %2 (zadeklarowano %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>brak algorytmu</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>Nie można wysłać tego tekstu wyszukiwania.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Wyszukiwanie może zawierać tylko zwykłe znaki ASCII, bez znaków nowej linii. Spróbuj wyszukać krótszą część słowa.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Ta wiadomość nie znajduje się już w tym folderze.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>Została przeniesiona lub usunięta po załadowaniu tej listy. Odśwież folder, aby zobaczyć, co się w nim teraz znajduje.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość jest zbyt duża, aby ją otworzyć.</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>Edytor poczty</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <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="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz kontroler IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwórz okno dialogowe kontrolera IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak konta pocztowego</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw skonfiguruj konto pocztowe z włączonym IMAP w Ustawieniach.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpisana część nie jest już w formie kanonicznej</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <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>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>Zduplikowany nagłówek %1</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <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="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres może być zafałszowany</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <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="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedzi trafiają gdzie indziej</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <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="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprawidłowa sekcja podpisana</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <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="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprawidłowa sekcja zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaszyfrowana sekcja musi zawierać dokładnie dwie części; ta zawiera %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie wszystko jest podpisane</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <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="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>Podpis obejmuje tylko zaszyfrowane dane.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <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="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Dołączono klucz publiczny</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <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="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Dołączono odrębny podpis</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <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="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryci odbiorcy są widoczni</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <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="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nic nie jest podpisane</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <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="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Niektóre części nie są podpisane.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <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="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryci odbiorcy</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <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="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>Obecny nagłówek Bcc</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <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="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbiorca może być podszyty</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <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="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak odbiorców</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta wiadomość nie jest zaadresowana do nikogo.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystawione przez: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ważne dla: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>NIEWAŻNY dla %1: wskazuje inny host</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ważny od %1 do %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.ru_RU.ts b/src/m_email/ts/ModuleEMail.ru_RU.ts
index d87cc9b..b5cec93 100644
--- a/src/m_email/ts/ModuleEMail.ru_RU.ts
+++ b/src/m_email/ts/ModuleEMail.ru_RU.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS (рекомендуется)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет (только этот компьютер)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Идентичность</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>Необязательно</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>Отображаемое имя</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес электронной почты</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Reply-To</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Получение (IMAP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправка (SMTP)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать эту учётную запись для получения</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать эту учётную запись для отправки</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя пользователя</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить подключение</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяется автоматически</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Папка отправленных</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановить</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Сделать основным</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Учётная запись, которая предлагается первой при отправке и используется, если не выбрана другая.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Пока нет почтовых учётных записей</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Учётная запись нужна только для получения и отправки сообщений. Всё остальное в GpgFrontend работает и без неё.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить учётную запись</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>Оставьте пустым, чтобы сохранить прежний пароль</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вход через собственную веб-страницу провайдера (OAuth2) пока не поддерживается. Если ваш провайдер требует такой вход, создайте пароль для приложения и используйте его здесь.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Почтовые учётные записи не сохранены</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эти учётные записи были созданы более новой версией GpgFrontend, поэтому эта версия не прочитала их и не изменяла их.
+
+Ваши учётные записи по-прежнему на месте. Используйте более новую версию, чтобы отредактировать их.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось прочитать сохранённые почтовые учётные записи, поэтому эта версия не изменяла их.
+
+Ничего не потеряно. Если это повторяется, сохранённый список, возможно, потребуется удалить вручную.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>Учётная запись без названия</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (по умолчанию)</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить учётную запись</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить %1?
+
+Его сохранённый пароль также будет удалён. Это действие нельзя отменить после нажатия OK в этом диалоге.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Этому аккаунту нужен адрес электронной почты.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>«%1» не похоже на адрес электронной почты.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Получение включено, но сервер не указан.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправка включена, но сервер не указан.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Включите получение, отправку или оба. Аккаунт, который не делает ни того, ни другого, использовать нельзя.</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>Другой аккаунт уже использует этот адрес. Их нельзя различить там, где предлагаются аккаунты.</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Порт %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Доверяю одному сертификату: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Перестать доверять&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверьте имя пользователя и пароль.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверьте адрес сервера на опечатку.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес разрешается, но ответа нет. Проверьте тип подключения и доступность сервера отсюда.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сертификат сервера не подписан центром сертификации, которому доверяет этот компьютер. Если вы сами запускаете этот сервер, вы можете довериться его сертификату.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>Срок действия сертификата сервера истёк или он ещё не действителен. Сначала проверьте часы на обеих машинах.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сертификат сервера выдан для другого хоста. Проверьте адрес сервера.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер не смог начать зашифрованный сеанс. Ничего не было отправлено.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось установить зашифрованное соединение.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сервер перестал отвечать. Попробуйте ещё раз.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это неполадка в GpgFrontend, а не на сервере.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Возможно, это временно. Попробуйте ещё раз.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Этот сервер представил сертификат, за который не ручается ни один удостоверяющий центр. Это нормально для сервера, которым вы управляете сами, и именно так выглядит перехват.
+
+%1
+SHA-256: %2
+
+Доверять именно этому сертификату для этой учётной записи? Любой другой сертификат, включая более позднюю замену этого, будет отклонён.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>(нет сведений о сертификате)</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>Доверять этому сертификату?</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сертификат считается доверенным для этой учётной записи. Проверьте ещё раз для подтверждения.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сначала введите адрес сервера.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сначала введите пароль.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверка...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановлено.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение успешно.</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось подключиться, причина неизвестна.</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Фильтр заголовков</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать только те заголовки, имя или значение которых содержит этот текст.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Значение</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать значение</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать поле целиком</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение не открыто.</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(некорректно)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этом сообщении нет заголовков для отображения.</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не настроено ни одной учётной записи с включённым IMAP.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удаётся открыть ни одну настроенную учётную запись. Проверьте «Настройки», раздел «Почтовые учётные записи».</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP отключён для этой учётной записи</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>не настроен сервер</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>не настроено имя пользователя</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>не сохранён пароль</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось открыть эту учётную запись: %1.
+
+Нажмите «Обновить», чтобы повторить попытку.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эту учётную запись невозможно открыть: %1.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Поиск по теме или отправителю</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезагрузить эту папку с сервера</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Папка</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Предыдущее</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Учетная запись</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>П&amp;апка</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Следующее</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите сообщение, чтобы просмотреть его подробности.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Скопировать весь Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Пароль для этой учетной записи не сохранен. Укажите его в настройках, в разделе «Учетные записи почты», затем нажмите «Повторить».</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключение...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать тему</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать отправителя</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(без темы)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Это сообщение больше, чем может открыть это приложение, поэтому его невозможно импортировать.</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Показано с предыдущего посещения этого аккаунта; обновление...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>Поиск...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка сообщений...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка папок...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этом аккаунте нет папок, которые можно открыть.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Показаны первые %1 совпадений; сузьте поиск, чтобы увидеть меньше.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 совпадений.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Страница %1 из %2</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эта папка пуста.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 из %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение оказалось пустым.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыто в новой вкладке.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка сообщения, %1 из %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановлено.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>пароль был отклонён</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>сервер не найден</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>безопасное соединение было отклонено</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка сообщения...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестный отправитель</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этой папке нет сообщений, соответствующих этому поиску.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите папку, чтобы просмотреть сообщения в ней.</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановить</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,7 @@ EML — это формат файла для представления эле�
 После исправления данных EML попробуйте выполнить операцию снова.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,62 +823,62 @@ If the issue persists, consider seeking technical support or consulting the docu
 Если проблема сохраняется, обратитесь в службу технической поддержки или ознакомьтесь с документацией.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Электронная почта</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>Копия</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>Скрытая копия</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP</translation>
     </message>
     <message>
         <source>Signed EML Data Hash (SHA1)</source>
@@ -876,201 +889,211 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">Алгоритм проверки целостности сообщения</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>Дайджест подписанной MIME-сущности (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Заявленный хэш подписи (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Вложения</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Получатель шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Получатель</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Идентификатор ключа</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>зашифровано для</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>зашифровано для, не указано в заголовках</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытый получатель</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>отправитель скрыл этот идентификатор ключа</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверка получателя</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифровать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>ПОЛУЧАТЕЛЬ</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>ПОДПИСАНТ</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить перед экспортом</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этом сообщении есть что-то, что стоит проверить перед сохранением.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <translation>**Примечание**: подписанная часть не находится в канонической форме, поскольку её окончания строк не являются CRLF. Что-то переписало это сообщение после его подписания; обычно это программа, которая изменила окончания строк при сохранении или копировании. Подпись не может быть проверена по этим байтам, и импорт ключа отправителя этого не изменит.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>, ключ OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>, не покрыто подписью</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>в %1, но не зашифровано для него: невозможно прочитать</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифровать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифровать E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифровать и подписать E-Mail</translation>
+    </message>
+    <message>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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="1779"/>
+        <location filename="../EMailModule.cpp" line="1707"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифровать и проверить E-Mail</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение E-Mail (*.eml);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удается записать файл %1:
+%2.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 не является обычным файлом, поэтому его нельзя открыть как сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>Файл %1 слишком большой (%2) для открытия. Максимально допустимый размер составляет %3.</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Не удается прочитать файл %1:
@@ -1095,428 +1118,427 @@ If the issue persists, consider seeking technical support or consulting the docu
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>разделяйте несколько адресов символом &quot;;&quot;</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>От:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>Копия/Скрытая копия</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Кому:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Копия:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытая копия:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Тема:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправить...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправить это сообщение через настроенную учётную запись почты.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="789"/>
         <location filename="../EMailPageView.cpp" line="1266"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Напишите ваше сообщение здесь.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавьте один или несколько файлов в это сообщение. Файлы также можно перетащить в сообщение.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="916"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранные вложения из этого сообщения.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить выбранные вложения в папку.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить все вложения в папку.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано. Расшифруйте его перед редактированием.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано и подписано. Расшифруйте его, затем удалите подпись перед редактированием.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Исходный код</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Защищённое сообщение</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <translation>Эти байты покрыты подписью или являются шифротекстом. Удалите подпись или расшифруйте сообщение перед редактированием его исходного кода.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1518"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>Завершить редактирование</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Редактировать исходный код</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы редактируете исходный код сообщения. Всё, что вы вводите здесь, является документом.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение заблокировано для просмотра. Его исходный код нельзя редактировать.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Только чтение. Разблокируйте для непосредственного редактирования исходного кода сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифровать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано и подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Получатели не указаны в заголовках.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Адресовано: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикрепить открытый ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить текст в это сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение заблокировано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение открыто только для просмотра, поэтому невозможно %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифруйте это сообщение, прежде чем пытаться %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <translation>Это черновик, который вы всё ещё пишете, а не полученное сообщение, поэтому здесь пока нет доступных действий.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <translation>Это сообщение в любом случае нельзя редактировать: оно подписано или зашифровано, поэтому уже защищено от переписывания.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <translation>Почтовый аккаунт ещё не настроен. Добавьте его в настройках, в разделе «Почтовые аккаунты», и это сообщение можно будет отправить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите, от кого это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес в поле «От» не похож на адрес электронной почты.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавьте хотя бы одного получателя.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите тему этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Это не похоже на адрес электронной почты: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Некорректная структура OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>Не подписано и не зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение заблокировано для просмотра.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифровать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифровать и подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сведения о подписи...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписать снова другим ключом...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить подпись...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>Расшифровать и проверить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сведения о шифровании...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробнее...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сначала расшифруйте это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Что не так с этим сообщением?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Попробовать проверить в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Попробовать расшифровать в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Подпись недоступна</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Подпись находится внутри зашифрованной части этого сообщения. Сначала расшифруйте его.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Нечего удалять</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение не содержит подписи.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <translation>Это сообщение недостаточно соответствует RFC 3156, чтобы безопасно удалить его подпись. Вместо этого отредактируйте исходный текст.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>Удалить подпись из этого сообщения?
+
+Подпись будет отброшена, и сообщение станет обычным, без подписи. Само сообщение останется без изменений. Это действие нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>без подписи</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удается отправить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Для отправки этого сообщения необходимы отправитель и хотя бы один получатель.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Тип</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">Сообщение</translation>
+        <translation>Сообщение</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>Структура</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>Безопасность</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Сведения о сообщении</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>Заголовки</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1.
+
+Скрытые получатели никогда не записываются в сообщение: заголовок Bcc сообщил бы каждому получателю, кто был в скрытой копии. Они используются для выбора получателей шифрования и не сохраняются вместе с файлом.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="561"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать копию и скрытую копию (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать сообщение</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать исходный документ</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Ответить</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>Написать ответ отправителю.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>Ответить всем</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <translation>Написать ответ отправителю и всем, кому было адресовано письмо. Скрытые получатели не включаются.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="696"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Переслать</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переслать это сообщение вместе с вложениями.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Только чтение</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <translation>Заблокировать это сообщение, чтобы его нельзя было редактировать или переписывать. Ответить и Переслать по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="751"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать, что известно об этом сообщении: его подписи, структуру и заголовки.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписано</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикрепить файл...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить все...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <translation>Это сообщение открыто только для просмотра. Его нельзя редактировать или переписывать; функции ответа и пересылки по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1188"/>
         <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>
+        <translation>Это сообщение подписано. Удалите подпись перед редактированием. Правка под подписью воспринимается как подделка.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1205"/>
         <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>
+        <translation>Это сообщение написано в HTML. Оно показано в виде исходного кода, а не в отрисованном виде: здесь не загружаются изображения и не открываются ссылки.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Только для чтения. Эти байты защищены. Удалите подпись или расшифруйте сообщение, чтобы редактировать их.</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1617"/>
         <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>
+        <translation>Это сообщение не удалось собрать для просмотра, поэтому здесь нечего показывать. Само сообщение не изменено.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно ответить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно ответить всем</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно переслать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Само сообщение не было изменено.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <translation>Новое сообщение не может быть открыто отсюда, потому что это представление находится не в окне с вкладками.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <translation>Не удалось собрать новое сообщение. Обычно это означает, что часть исходного сообщения не удалось перекодировать, чаще всего вложение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось открыть вкладку для нового сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <translation>Новая вкладка открылась, но в ней не отображается представление сообщения, поэтому ответ некуда поместить. Вкладку можно закрыть.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1890"/>
+        <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>
+        <translation>Получатели не указаны, поэтому нельзя сказать, можно ли открыть это сообщение, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <translation>У вас нет закрытого ключа ни для одного из этих адресов. Если только сообщение не было также зашифровано для ключа, который здесь не указан, его нельзя открыть на этом компьютере.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>У вас есть закрытый ключ для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>У вас есть закрытые ключи для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>Это сообщение подписано, поэтому его нельзя изменить: правка под подписью воспринимается как подделка.
+
+Удалить подпись и сделать его обычным сообщением?</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>Зашифровано, подпись не проверена</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>Подпись не проверена</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>Зашифровано, подпись проверена</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>Подпись проверена</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>Подписано другим адресом</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>Срок действия подписи или ключа истёк</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>Подписано неизвестным ключом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>Недействительная подпись</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>подписано, не проверено</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>подпись недействительна</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <translation>Некоторые части находятся вне подписанного раздела этого сообщения. Они не покрыты подписью и могли быть добавлены кем угодно.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 вложений</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Электронное письмо (*.eml);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Прикрепить файлы</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 — это папка</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 не является обычным файлом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ничего не прикреплено:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Эти файлы не были прикреплены:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Импортировать ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать имя</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 — это не тот тип файлов, который эта программа может открыть, поскольку открытие означало бы его запуск или передачу программе, которая может его выполнить.
+
+Сохраните его, а затем откройте самостоятельно, если вы уверены в его источнике.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось создать временную папку для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать %1 для открытия.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этой системе ни одна программа не зарегистрирована для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить из этого сообщения:
+
+%1
+
+Это сообщение получено откуда-то ещё, поэтому, если эти файлы ещё не сохранены, это единственная их копия. Удаление нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранено. Некоторые имена в этой папке уже заняты, поэтому эти файлы сохранены под другими именами:
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранён 1 файл.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранено файлов: %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить вложения</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать: %1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>пригоден</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>скоро истечёт</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>срок истёк</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>отозван</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>отключено</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>неизвестно</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>действителен</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>действителен, с проблемами</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>действителен, ключ не полностью доверенный</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>недействителен</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>открытый ключ отсутствует</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>ключ подписи отозван</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Срок действия подписи истёк</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Срок действия ключа подписи истёк</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>недействительная подпись: ключ подписи отозван</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>НЕДЕЙСТВИТЕЛЬНАЯ ПОДПИСЬ: не соответствует этим байтам</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>действительна, но подписана другим адресом</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Элемент</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет открытого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать значение</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать отпечаток</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать адрес</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Импортировать ключ из этого сообщения</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>Проверить снова</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписи</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Подпись %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>покрывает %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>покрывает %1, вложенность: %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Результат</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>этот раздел подписан, но ещё не проверен</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <translation>этот раздел подписан, но проверка не дала результата: возможно, ключа подписи нет в вашей связке ключей</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестный подписант</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>Другой адрес</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="376"/>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Алгоритм открытого ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписано</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Заявленный хэш (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Хэш подписи</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Несовпадение хэша</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>в сообщении указан %1, но в подписи использован %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">Предупреждение</translation>
+        <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Получатели</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>адресовано и зашифровано для</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Об этом сообщении больше нечего сообщить.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>зашифровано для, но не в видимых заголовках</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытый получатель</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>отправитель решил не указывать, кто это</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Отпечаток</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>в %1, но не зашифровано для него: они не смогут это прочитать</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Примечание</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <translation>движок сообщил первичный ключ вместо фактически использованного подключа шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключи для этих адресов</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ не найден</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 ключ</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ключ(ей)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ: %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>этот адрес принадлежит отозванному идентификатору пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>этот адрес является первичным идентификатором пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>этот адрес является вторичным идентификатором пользователя ключа</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>этот ключ не может использоваться для шифрования</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>Что бросается в глаза</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение не подписано и не зашифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение содержит подпись.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение зашифровано и содержит подпись.</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>Это сообщение заявляет об использовании OpenPGP, но его структура не соответствует RFC 3156.</translation>
     </message>
 </context>
 <context>
@@ -2203,48 +2323,50 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправить сообщение</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(без темы)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Готово к отправке. Пока ничего не покинуло этот компьютер.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">Сообщение</translation>
+        <translation>Сообщение</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">От</translation>
+        <translation>От</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">Кому</translation>
+        <translation>Кому</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет видимых получателей</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытые копии</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %n вложение
+%1, %n вложения
+%1, %n вложений</numerusform>
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
@@ -2252,235 +2374,235 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержит</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправить через</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>Результат</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправка</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Копия в отправленных</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 порт %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановить</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Подробнее</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать подробности</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <translation>Эти адреса передаются только исходящему серверу. Они не отображаются в сообщении, поэтому их не видят другие получатели.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="402"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправить</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">Отмена</translation>
+        <translation>Отмена</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не настроена ни одна исходящая учетная запись.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <translation>Для этой учетной записи не сохранен пароль, поэтому через нее нельзя отправить ни одного сообщения. Задайте пароль в Настройках, в разделе «Почтовые аккаунты», и включите параметр запоминания.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="517"/>
         <location filename="../EMailSendDialog.cpp" line="900"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправка. В этом окне будет показано, что произошло.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эта учётная запись настроена только для отправки, поэтому нет почтового ящика для сохранения копии.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="649"/>
         <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>
+        <translation>копия была помещена в %1, но её нельзя найти впоследствии: это сообщение не содержит Message-ID. Сообщение, отправленное точно в том виде, в котором оно поступило, никогда не получает его, потому что его добавление изменило бы байты, которые может покрывать подпись.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="658"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось определить папку «Отправленные» для этой учётной записи.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать копию в почтовый ящик.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать копию в почтовый ящик: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановка...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Всё ещё отправляется</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение всё ещё отправляется.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <translation>Сервер, возможно, уже принял его. Если вы закроете это окно сейчас, вы не узнаете, было ли оно доставлено, а повторная отправка может привести к его двойной доставке.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="718"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>Подождать</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>Всё равно закрыть</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Ещё не отправлено</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Отправка...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <translation>Неизвестно. Соединение было потеряно после отправки сообщения, поэтому сервер мог принять его, а мог и не принять. Проверьте папку «Отправленные» или получателя, прежде чем отправлять снова: повторная отправка может доставить сообщение дважды.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="770"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>Да, принято исходящим почтовым сервером</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>Не сохранено</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранение копии в «Отправленные»...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>Копия не была сохранена.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение было отправлено, но %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>Для этой учётной записи не сохранён пароль, поэтому не удалось открыть её почтовый ящик.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="685"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось получить доступ к почтовому ящику.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось получить доступ к почтовому ящику: %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Ожидает отправки сообщения</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Да, ваш почтовый сервер уже поместил его в %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Да, сохранено в %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Остановлено: копия не сохранена. Сообщение всё равно было отправлено.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Неизвестно, было ли сообщение отправлено.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Передано на исходящий почтовый сервер.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не отправлено.</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Закрыть (%1)</translation>
     </message>
 </context>
 <context>
@@ -2488,353 +2610,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Часть</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Кодировка</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>Покрыто</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сообщение не открыто.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить часть...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Импортировать этот ключ</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать Content-Type</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать имя</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить часть</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось записать %1.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA-256 этой части: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>подпись %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>не покрыто</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>Управляющая часть OpenPGP</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ключ OpenPGP, который можно импортировать.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID: %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>В этом сообщении нет частей для отображения.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение не содержит подписанного раздела.</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>Подпись %1 покрывает %2 (заявлено %3)</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>нет алгоритма</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>Этот поисковый запрос невозможно отправить</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>Поисковый запрос может содержать только обычные ASCII-символы, без переносов строк. Попробуйте искать более короткую часть слова.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>Этого сообщения больше нет в этой папке</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>Оно было перемещено или удалено после загрузки этого списка. Обновите папку, чтобы увидеть текущее содержимое.</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение слишком большое для открытия</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>Редактор почты</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <source>Open a new text editor for email.</source>
         <translation>Открыть новый текстовый редактор для электронной почты.</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть контроллер IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть диалог контроллера IMAP</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет учетной записи почты</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сначала настройте учетную запись почты с включенным IMAP в настройках.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>Подписанная часть больше не в канонической форме</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <translation>Подписанная часть содержит окончания строк, отличные от CRLF, а это не та форма, для которой вычисляется подпись. Что-то переписало это сообщение после подписания, обычно программа, которая изменила окончания строк при сохранении или копировании, а не атака. Подпись не может быть проверена для этих байтов, и импорт ключа отправителя этого не изменит. Для проверки нужно исходное, неизменённое сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>Повторяющийся заголовок %1</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <translation>Это сообщение содержит %1 копий заголовка, который может встречаться только один раз. Разные почтовые программы выбирают разные копии, поэтому то, что вы видите здесь, может не совпадать с тем, что видит другой читатель.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Адрес может быть замаскирован</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <translation>Домен в «%1» использует символы, которые можно отобразить так, чтобы они выглядели как другой, знакомый адрес.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>Ответы уходят в другое место</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <translation>Это сообщение от «%1», но ответы будут отправлены на «%2», а это другой домен.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>Некорректный подписанный раздел</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <translation>Подписанный раздел должен содержать ровно две части; в этом разделе их %1. Подпись может не пройти проверку, и то, что она охватывает, неоднозначно.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>Некорректный зашифрованный раздел</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Зашифрованный раздел должен содержать ровно две части; в этом разделе их %1.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Не всё подписано</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <translation>%1 часть(ей) этого сообщения находится вне подписи. Они поступили без аутентификации и могли быть добавлены или изменены кем угодно на пути.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>Подпись покрывает только зашифрованные данные</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <translation>Эта подпись была создана по зашифрованному блоку, а не по сообщению внутри него. Она показывает, кто передал шифротекст; она не говорит, кто написал то, что вы читаете, и любой мог подписать копию этого же блока.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Открытый ключ прикреплён</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <translation>Это сообщение содержит %1 открытый(е) ключ(и) OpenPGP. Ключ, пришедший в сообщении, ничего не доказывает о том, кто его отправил: любой может прикрепить любой ключ, в том числе созданный для имени из строки «От».</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Отделённая подпись прикреплена</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <translation>Это сообщение содержит %1 файл(ов) подписи, которые не являются частью его собственной подписанной структуры. Открытие сообщения не проверяет их; они подписывают что-то другое.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытые получатели видны</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <translation>Это сообщение содержит заголовок Bcc с указанием %1 получателя(ей). Любой, кто получил его, может видеть, кому была отправлена скрытая копия.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ничего не подписано</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <translation>Это сообщение не содержит подписи, поэтому получатель не может определить, что оно исходит от вас или что оно дошло без изменений.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>Некоторые части не подписаны</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Без подписи: %1 часть(и) этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытые получатели</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Скрытые получатели: %1. Они будут учтены при шифровании, но не появятся в сообщении.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>Присутствует заголовок Bcc</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение содержит заголовок Bcc. При отправке каждый получатель узнает, кто был в скрытой копии.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>Возможна подмена получателя</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>Домен в &quot;%1&quot; содержит символы, которые могут быть похожи на символы другого адреса. Проверьте адрес перед отправкой.</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет получателей</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Это сообщение никому не адресовано.</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Издатель: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Действителен для: %1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>Недействителен для %1: указан другой хост</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Действителен с %1 по %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.zh_CN.ts b/src/m_email/ts/ModuleEMail.zh_CN.ts
index 2f53d45..9c06879 100644
--- a/src/m_email/ts/ModuleEMail.zh_CN.ts
+++ b/src/m_email/ts/ModuleEMail.zh_CN.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS（推荐）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>无（仅本机）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>身份</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>可选</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>显示名称</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>电子邮件地址</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>回复地址</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>接收（IMAP）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>发送（SMTP）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此账户接收</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此账户发送</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>连接</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>用户名</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>测试连接</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>自动发现</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>已发送文件夹</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>添加</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>设为默认</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>发送时首选账户，未选择其他账户时使用的账户。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>尚无邮件账户</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>仅当获取和发送消息时才需要账户。GpgFrontend 中的其他一切功能均无需账户即可使用。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>添加账户</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>留空以保留已存储的密码</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>尚不支持通过提供商自己的网页（OAuth2）登录。如果您的提供商要求这样做，请创建应用专用密码并在此处使用。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>邮件账户未保存</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>这些账户是由更高版本的 GpgFrontend 设置的，因此此版本未读取它们，也未更改它们。
+
+您的账户仍然存在。请使用更高版本来编辑它们。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法读取存储的邮件账户，因此此版本未更改它们。
+
+没有丢失任何内容。如果这种情况持续发生，可能需要手动删除存储的列表。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>未命名账户</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1（默认）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>删除账户</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>删除 %1？
+
+其存储的密码也会被遗忘。一旦在此对话框中按下“确定”，此操作将无法撤销。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>此账户需要一个电子邮件地址。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>“%1”看起来不像电子邮件地址。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>已开启接收，但未设置服务器。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>已开启发送，但未设置服务器。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>请开启接收、发送或两者。两者都不开启的账户无法使用。</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>另一个账户已在使用此地址。在提供账户选择时无法区分它们。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>端口 %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>信任一个证书：%1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;停止信任它&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>请检查用户名和密码。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>请检查服务器地址是否有拼写错误。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>地址解析成功，但无响应。请检查连接类型，以及服务器是否可从此处访问。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器的证书不是由这台计算机信任的机构签发的。如果您自己运行此服务器，可以选择信任其证书。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器的证书已过期或尚未生效。请先检查两台机器上的时钟。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器的证书对应的是另一台主机。请检查服务器地址。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器拒绝建立加密会话。未向其发送任何内容。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法建立加密连接。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>服务器不再响应。请重试。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>这是 GpgFrontend 的故障，而非服务器的问题。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>这可能是暂时性的。请重试。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>此服务器出示了一份没有权威机构为其担保的证书。对于您自己运行的服务器，这很正常；但这也正是中间人截获时的样子。
+
+%1
+SHA-256: %2
+
+是否为此账户信任这一确切证书？任何其他证书，包括该证书之后的替换证书，仍将被拒绝。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>（无证书详细信息）</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>信任此证书？</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>此证书已被该账户信任。请再次测试以确认。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>请先输入服务器地址。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>请先输入密码。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在测试...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>连接成功。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法连接，原因未知。</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>筛选邮件头</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>仅显示名称或值包含此文本的邮件头。</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>值</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>复制值</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>复制整个字段</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有打开的邮件。</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(格式错误)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>此邮件没有可显示的邮件头。</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP 控制器</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>尚未配置启用 IMAP 的邮件账户。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开任何已配置的账户。请在“设置”的“邮件账户”下检查。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>此账户的 IMAP 已关闭</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>未配置服务器</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>未配置用户名</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>未存储密码</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开此账户：%1。
+
+请使用“刷新”重试。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开此账户：%1。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>搜索主题或发件人</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>从服务器重新加载此文件夹</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>文件夹</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>上一个</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>账户(&amp;A)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>文件夹(&amp;O)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>下一个</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>打开</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>选择邮件以查看其详细信息。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>复制完整的 Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>此账户未存储密码。请在设置中的邮件账户下设置密码，然后使用“重试”。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在连接...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>复制主题</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>复制发件人</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>复制 Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(无主题)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>此消息大于本应用可打开的大小，因此无法导入。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>显示的是上次访问此账户时的内容；正在刷新。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>无</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在搜索...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在加载邮件...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在加载文件夹...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>此账户没有可打开的文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>正在显示前 %1 条匹配结果；请缩小搜索范围以减少结果。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 条匹配结果。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>第 %1 页，共 %2 页</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>此文件夹为空。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2 / %3</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>该邮件内容为空。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>已在新标签页中打开。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在下载邮件，%1 / %2...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>密码被拒绝</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>未找到服务器</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>安全连接被拒绝</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在下载邮件...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>未知发件人</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>此文件夹中没有符合该搜索条件的邮件。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>选择一个文件夹以查看其中的邮件。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,7 @@ EML 是一种用于表示电子邮件的文件格式，通常包含头部、正�
 修正 EML 数据后，请重试该操作。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,60 @@ If the issue persists, consider seeking technical support or consulting the docu
 如果问题仍然存在，请寻求技术支持或查阅相关文档。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>收件人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>抄送</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>密送</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">消息完整性检查算法</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>已签名 MIME 实体的摘要 (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>声明的签名哈希值 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>附件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>加密接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>密钥 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>加密至</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>加密至，未包含在邮件头中</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>发件人未提供此密钥 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>接收者检查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>详情</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>签名</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>验证</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>签署人</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>导出前检查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息中有某些内容值得在保存前检查。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <translation>**注意**：签名部分不是规范形式，因为其行尾不是 CRLF。某些程序在签名后重写了此消息，通常是保存或复制时更改行尾的程序。签名无法针对这些字节进行验证，导入发送者的密钥也不会改变这一点。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>验证电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>，一个 OpenPGP 密钥</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>，未被签名覆盖</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>在 %1 中，但未加密给它：无法读取</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>解密电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>签名电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>加密电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>加密并签名电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>解密并验证电子邮件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>保存文件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>电子邮件消息 (*.eml);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法写入文件 %1：
+%2。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 不是普通文件，因此无法作为消息打开。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件 %1 太大（%2），无法打开。允许的最大大小为 %3。</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>无法读取文件 %1：
@@ -1095,428 +1118,427 @@ If the issue persists, consider seeking technical support or consulting the docu
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>用&quot;;&quot;分隔多个地址</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>发件人:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>抄送/密送</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>收件人:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>抄送:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>密送:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>主题:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>发送...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <translation>通过已配置的邮件账户发送此消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="789"/>
         <location filename="../EMailPageView.cpp" line="1266"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>在此处撰写您的消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>向此消息添加一个或多个文件。也可以将文件拖放到消息上。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="916"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>从消息中移除选中的附件。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>将选定的附件写入文件夹。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>将所有附件写入文件夹。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密。编辑前请先解密。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密并签名。编辑前请先解密，然后移除签名。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>原始源</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>受保护消息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <translation>这些字节受签名保护，或是密文。编辑其源前，请先移除签名或解密消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1518"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>停止编辑</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑原始源</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>您正在编辑原始消息源。您在此输入的内容就是文档。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已锁定以供检查。无法编辑其源。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>只读。解锁后可直接编辑消息源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密并签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>邮件头中未指明接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>收件人：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>附加公钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>向此消息添加文本</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>消息已锁定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息仅供查看，因此无法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>请先解密此消息，再尝试%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>消息已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <translation>这是您仍在撰写的草稿，不是已收到的邮件，因此目前没有可操作的内容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <translation>此邮件无论如何都无法编辑：它已签名或加密，因此已受到保护，无法被重写。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <translation>尚未设置邮件账户。请在“设置”的“邮件账户”下添加一个账户，然后即可发送此邮件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>请填写此邮件的发件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>发件人地址看起来不像电子邮件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>请至少添加一个收件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>请为此邮件填写主题。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>这看起来不像电子邮件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP 结构格式错误</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>既未签名也未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>此邮件已锁定，仅供查看。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密并签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>验证签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>签名详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>使用另一密钥重新签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>移除签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>解密并验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密详情...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>请先解密此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息有什么问题？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍然尝试验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍然尝试解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>无法获取签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>签名位于此消息的加密部分中。请先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>没有可移除的内容</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息不包含签名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>无法移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <translation>此消息未严格遵循 RFC 3156，无法安全地移除其签名。请改为编辑原始源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>从该消息中移除签名？
+
+签名将被丢弃，消息将变为普通的未签名消息。消息本身将保持原样。此操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>未签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>无法发送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息需要发件人和至少一个接收者才能发送。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>类型</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">邮件消息</translation>
+        <translation>消息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>结构</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>安全性</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>消息详情</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>邮件头</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1。
+
+密件接收者永远不会写入消息中：Bcc 头会告诉每个接收者谁被密件抄送。它们用于选择加密接收者，并且不会随文件保存。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="561"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>显示抄送和密件抄送 (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>显示消息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>显示原始文档</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>回复</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>向发件人写回复。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>全部回复</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <translation>向发件人及所有收件人写回复。不包括密送接收者。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="696"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>转发</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>将此消息连同附件转发。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>只读</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <translation>锁定此消息，使其无法编辑或重写。回复和转发仍然有效，并生成新消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="751"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>显示此消息的已知信息：其签名、结构和邮件头。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>大小</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已签名</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>附加文件...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>保存...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>全部保存...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <translation>此消息仅供查看。无法编辑或重写；回复和转发仍然有效，并会生成新消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1188"/>
         <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>
+        <translation>此消息已签名。编辑前请移除签名。在签名下进行编辑会被视为伪造。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1205"/>
         <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>
+        <translation>此消息以 HTML 编写。显示的是其源代码而非渲染结果：此处不会加载图片或打开链接。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>只读。这些字节受保护。要编辑它们，请移除签名或解密消息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1617"/>
         <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>
+        <translation>无法组装此消息以供检查，因此这里没有可显示的内容。消息本身未更改。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>无法回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>无法全部回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>无法转发</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息本身未更改。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <translation>无法从此处打开新消息，因为此视图不在包含标签页的窗口中。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <translation>无法组装新消息。这通常意味着原始消息的某个部分无法重新编码，最常见的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法为新消息打开标签页。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <translation>新标签页已打开，但未显示消息视图，因此无处放置回复。可以关闭该标签页。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1890"/>
+        <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>
+        <translation>未列出接收者，因此能否打开此消息只有尝试后才能知道。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <translation>您不持有这些地址中任何一个的私钥。除非消息还加密到了此处未列出的密钥，否则无法在这台计算机上打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>您持有 %1 的私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>您持有 %1 的多个私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>此消息已签名，因此无法更改：在签名下进行编辑会被视为伪造。
+
+是否移除签名并将其变为普通消息？</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>已加密，未检查签名</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>签名未检查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>已加密，签名已验证</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>签名已验证</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>由不同的地址签名</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>签名或密钥已过期</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>由未知密钥签名</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>签名无效</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>已签名，未检查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>签名不正确</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <translation>此消息的某些部分位于签名部分之外。它们不受签名保护，任何人都可能添加。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>电子邮件 (*.eml);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>添加附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 是一个文件夹</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 不是普通文件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>未附加任何内容：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>以下文件未附加：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>打开</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>导入密钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>复制名称</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>打开附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 不是本程序会为您打开的文件类型，因为打开它可能意味着运行它或将其交给可能运行它的程序。
+
+请改为保存它，如果您确定其来源，再自行打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法创建用于打开 %1 的临时文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法写出 %1 以将其打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>此系统上没有注册可打开 %1 的程序。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>从这封邮件中取出：
+
+%1
+
+这封邮件来自其他地方，因此除非这些文件已保存，否则这是唯一的副本。移除操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>已保存。该文件夹中已有一些名称被占用，因此这些文件以不同的名称写入：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>已保存 1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>已保存 %1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法写入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无法写入：%1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>可用</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>即将过期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>已过期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>已吊销</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>已禁用</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>未知</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>有效</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>有效，但存在问题</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>有效，密钥未完全信任</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>无效</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>公钥缺失</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>签名密钥已吊销</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>签名已过期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>签名密钥已过期</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>无效签名：签名密钥已吊销</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>签名错误：与这些字节不匹配</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>有效，但由其他地址签名</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>项目</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>详情</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>未打开任何消息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>复制值</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>复制指纹</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>复制地址</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>导入此消息中的密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>重新验证</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>签名</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>签名 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>涵盖 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>涵盖 %1，嵌套 %2 层</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>结果</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>此部分已签名，但尚未验证</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <translation>此部分已签名，但验证未产生结果：签名密钥可能不在您的密钥环中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>未知签署人</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>地址不同</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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="376"/>
+        <location filename="../EMailSecurityView.cpp" line="421"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>公钥算法</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>签名时间</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>声明哈希 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>签名哈希</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>哈希不匹配</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>消息声明为 %1，但签名使用了 %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">警告</translation>
+        <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>接收者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>收件人为并加密给</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>关于此消息没有更多可报告的信息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>密钥 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>已加密给，但不在可见邮件头中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>发件人选择不记录其身份</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>指纹</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>在 %1 中，但未对其加密：他们无法读取</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>注意</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <translation>引擎报告的是主密钥，而非实际使用的加密子密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>这些地址对应的密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>未找到密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 个密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 个密钥</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>密钥为 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>身份</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址位于该密钥的已吊销用户 ID 上</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址是密钥的主用户 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址是密钥的次要用户 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>此密钥不能用于加密</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>突出之处</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息既未签名也未加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息带有签名。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息已加密并带有签名。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>此消息声称使用 OpenPGP，但其结构不符合 RFC 3156。</translation>
     </message>
 </context>
 <context>
@@ -2203,282 +2323,282 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>发送消息</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>（无主题）</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>准备发送。尚未有任何数据离开这台计算机。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">邮件消息</translation>
+        <translation>正文</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">发件人</translation>
+        <translation>发件人</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">收件人</translation>
+        <translation>接收者</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>没有可见的接收者</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>密送</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1，%n 个附件</numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>包含</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>发送方式</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>结果</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>提交</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>在已发送中保存副本</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 端口 %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>详细信息</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>复制详细信息</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <translation>这些地址仅提供给外发服务器。它们不会显示在邮件中，因此其他接收者无法看到。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="402"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>发送</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>未配置外发账户。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <translation>此账户未存储密码，因此无法通过它发送任何内容。请在设置中的“邮件账户”下设置密码，并开启记住密码的选项。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="517"/>
         <location filename="../EMailSendDialog.cpp" line="900"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>正在发送。此窗口将显示发送结果。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <translation>此账户仅用于发送，因此没有可保存副本的邮箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="649"/>
         <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>
+        <translation>副本已放入 %1，但之后无法查找：此消息没有 Message-ID。完全按原样发送的消息不会获得 Message-ID，因为添加它会改变可能被签名覆盖的字节。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="658"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法为此账户识别“已发送”文件夹。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法将副本写入邮箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无法将副本写入邮箱：%1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在停止...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>仍在发送</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息仍在发送中。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <translation>服务器可能已接受该消息。如果现在关闭此窗口，您将无法得知是否送达，而重新发送可能会导致重复投递。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="718"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>继续等待</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍然关闭</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>尚未发送</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在发送...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <translation>未知。消息发送后连接已丢失，因此服务器可能已接受，也可能未接受。再次发送前请检查“已发送”文件夹或接收者：重新发送可能导致投递两次。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="770"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>是，外发邮件服务器已接受</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>未保存</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在将副本保存到“已发送”...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>未保留副本。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>消息已发送，但 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>此账户未存储密码，因此无法打开其邮箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="685"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法访问邮箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>无法访问邮箱：%1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>等待消息发送完成</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>是的，您的邮件服务器已将邮件归档到 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>是的，已保存到 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止：未保留副本，但邮件仍已发送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法确认该邮件是否已发送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>已交给外发邮件服务器。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>未发送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭 (%1)</translation>
     </message>
 </context>
 <context>
@@ -2486,353 +2606,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>部件</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>大小</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>编码</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>由...覆盖</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>没有打开的消息。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>保存部件...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>导入此密钥</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>复制 Content-Type</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>复制名称</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>复制 SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>保存部件</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法写入 %1。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>此部分的 SHA-256：%1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>签名 %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>未覆盖</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP 控制部分</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>可导入的 OpenPGP 密钥。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID：%1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>此邮件没有可显示的部分。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>此邮件不包含已签名的部分。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>签名 %1 覆盖 %2（声明为 %3）</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>无算法</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>该搜索文本无法发送</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>搜索只能包含普通 ASCII 字符，且不能包含换行符。请尝试搜索单词中较短的部分。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>该邮件已不在此文件夹中</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>该邮件在列表加载后被移动或删除。请刷新文件夹以查看当前内容。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>该邮件太大，无法打开。</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>邮件编辑器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <source>Open a new text editor for email.</source>
         <translation>打开新的电子邮件文本编辑器。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>打开 IMAP 控制器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>打开 IMAP 控制器对话框</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>没有邮件账户</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>请先在设置中配置启用 IMAP 的邮件账户。</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>签名部分不再符合规范形式</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <translation>签名部分包含的行结尾不是 CRLF，这不是计算签名时所依据的形式。此消息在签名后被某些程序重写，通常是某个程序在保存或复制时更改了行结尾，而非攻击。签名无法针对这些字节验证，导入发送者的密钥也不会改变这一点。要检查它，需要原始未修改的消息。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>重复的 %1 标头</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <translation>此消息携带了 %1 份只能出现一次的标头。不同的邮件程序会选择不同的副本，因此您在这里看到的内容可能与其他读者看到的不同。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>地址可能被伪装</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <translation>&quot;%1&quot; 中的域名使用了可被绘制成看似另一个熟悉地址的字符。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>回复发往别处</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <translation>此消息来自 &quot;%1&quot;，但回复将发送到 &quot;%2&quot;，这是不同的域名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>签名部分格式错误</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <translation>签名部分必须恰好包含两个部分；此部分包含 %1 个。它可能无法验证，且其覆盖范围不明确。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>加密部分格式错误</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>加密部分必须恰好包含两个部分；此部分包含 %1 个。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>并非所有内容都已签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <translation>此消息的 %1 个部分位于签名之外。它们未经认证到达，路径上的任何人都可能添加或更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>签名仅覆盖加密数据</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <translation>此签名是针对加密块生成的，而非针对其内部的消息。它表明谁发送了密文，但不能说明谁编写了你正在阅读的内容；任何人都可能对同一加密块的副本进行签名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>附带公钥</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <translation>此消息带有 %1 个 OpenPGP 公钥。消息中附带的密钥不能证明其发送者身份：任何人都可以附加任何密钥，包括他们为发件人行上的名称所创建的密钥。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>附带分离式签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <translation>此消息带有 %1 个签名文件，这些文件不属于其自身签名结构的一部分。打开消息不会检查这些文件；它们为其他内容签名。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>密件抄送接收者可见</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <translation>此消息带有 Bcc 标头，列出了 %1 个接收者。任何收到此消息的人都可以看到谁被密送。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>未签名任何内容</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <translation>此消息没有签名，因此接收者无法判断它是否来自您，也无法判断其是否未被更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>部分内容未签名</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息的 %1 个部分将在没有签名覆盖的情况下发出。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏接收者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 个隐藏接收者将包含在加密中，但不会出现在消息的任何位置。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>存在 Bcc 标头</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息带有 Bcc 标头。发送它会告诉每个接收者谁被密送。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>接收者可能被伪装</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>“%1”中的域名使用了可被伪装成其他地址的字符。发送前请检查。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>无接收者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>此消息未指定任何接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>签发者：%1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>适用于：%1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>不适用于 %1：它指定了不同的主机</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>有效期从 %1 到 %2</translation>
     </message>
 </context>
 </TS>
diff --git a/src/m_email/ts/ModuleEMail.zh_TW.ts b/src/m_email/ts/ModuleEMail.zh_TW.ts
index 9d4b61e..e35e360 100644
--- a/src/m_email/ts/ModuleEMail.zh_TW.ts
+++ b/src/m_email/ts/ModuleEMail.zh_TW.ts
@@ -6,340 +6,351 @@
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="72"/>
         <source>TLS (recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>TLS（建議使用）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="76"/>
         <source>STARTTLS</source>
-        <translation type="unfinished"></translation>
+        <translation>STARTTLS</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="80"/>
         <source>None (this machine only)</source>
-        <translation type="unfinished"></translation>
+        <translation>無（僅限本機）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="126"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>身分</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="133"/>
         <source>Optional</source>
-        <translation type="unfinished"></translation>
+        <translation>選填</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="135"/>
         <source>Display name</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示名稱</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="136"/>
         <source>Email address</source>
-        <translation type="unfinished"></translation>
+        <translation>電子郵件地址</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="137"/>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>回覆地址</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Receiving (IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>接收（IMAP）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="148"/>
         <source>Sending (SMTP)</source>
-        <translation type="unfinished"></translation>
+        <translation>寄送（SMTP）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to receive</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此帳戶接收</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="155"/>
         <source>Use this account to send</source>
-        <translation type="unfinished"></translation>
+        <translation>使用此帳戶寄送</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="178"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="179"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>連線</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="180"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>使用者名稱</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="182"/>
         <source>Test Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>測試連線</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="202"/>
         <source>Discovered automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>自動偵測</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="203"/>
         <source>Sent folder</source>
-        <translation type="unfinished"></translation>
+        <translation>寄件備份</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="224"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="273"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>新增</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="274"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="276"/>
         <source>Set as Default</source>
-        <translation type="unfinished"></translation>
+        <translation>設為預設</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="278"/>
         <source>The account offered first when sending, and the one used when nothing else is chosen.</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送郵件時優先使用的帳戶，也是未選擇其他帳戶時所使用的帳戶。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="307"/>
         <source>No mail accounts yet</source>
-        <translation type="unfinished"></translation>
+        <translation>尚無郵件帳戶</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="314"/>
         <source>An account is needed only to fetch and send messages. Everything else in GpgFrontend works without one.</source>
-        <translation type="unfinished"></translation>
+        <translation>僅在收取和傳送郵件時才需要帳戶。GpgFrontend 的其他功能均可在沒有帳戶的情況下正常運作。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="319"/>
         <source>Add an Account</source>
-        <translation type="unfinished"></translation>
+        <translation>新增帳戶</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="349"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="364"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="354"/>
         <source>Leave blank to keep the stored one</source>
-        <translation type="unfinished"></translation>
+        <translation>留空以保留已儲存的密碼</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="357"/>
         <source>Signing in through a provider&apos;s own web page (OAuth2) is not supported yet. If your provider requires it, create an app-specific password and use that here.</source>
-        <translation type="unfinished"></translation>
+        <translation>目前尚未支援透過提供者的網頁登入 (OAuth2)。若你的提供者要求此方式，請建立應用程式專用密碼，並在此處使用該密碼。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="429"/>
         <source>Mail Accounts Not Saved</source>
-        <translation type="unfinished"></translation>
+        <translation>郵件帳戶未儲存</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="431"/>
         <source>These accounts were set up by a newer version of GpgFrontend, so this version did not read them and has not changed them.
 
 Your accounts are still there. Use the newer version to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>這些帳戶是由更新版的 GpgFrontend 所建立，因此此版本未讀取也未變更它們。
+
+你的帳戶仍然存在。請使用更新版來編輯。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="435"/>
         <source>The stored mail accounts could not be read, so this version has not changed them.
 
 Nothing has been lost. If this keeps happening, the stored list may need to be removed by hand.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法讀取已儲存的郵件帳戶，因此此版本未變更它們。
+
+沒有遺失任何資料。如果此情況持續發生，可能需要手動移除已儲存清單。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="480"/>
         <source>Untitled account</source>
-        <translation type="unfinished"></translation>
+        <translation>未命名帳戶</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="498"/>
         <location filename="../EMailAccountSettingsPage.cpp" line="520"/>
         <source>%1 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1（預設）</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="568"/>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>移除帳戶</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="569"/>
         <source>Remove %1?
 
 Its stored password is forgotten as well. This cannot be undone once you press OK in this dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除 %1？
+
+其儲存的密碼也將一併遺忘。一旦在此對話方塊中按下「確定」，此操作便無法復原。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="679"/>
         <source>This account needs an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>此帳戶需要電子郵件地址。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="681"/>
         <source>&quot;%1&quot; does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;%1&quot; 看起來不像電子郵件地址。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="686"/>
         <source>Receiving is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>接收已開啟，但未設定伺服器。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="689"/>
         <source>Sending is turned on but no server is set.</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送已開啟，但未設定伺服器。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="694"/>
         <source>Turn on receiving, sending, or both. An account that does neither cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>請開啟接收、傳送或兩者。若兩者皆未開啟，帳戶無法使用。</translation>
     </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>
-        <translation type="unfinished"></translation>
+        <translation>另一個帳戶已使用此地址。在提供帳戶的地方將無法區分它們。</translation>
     </message>
     <message>
         <location filename="../EMailAccountSettingsPage.cpp" line="737"/>
         <source>Port %1</source>
-        <translation type="unfinished"></translation>
+        <translation>連接埠 %1</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="866"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="876"/>
         <source>Trusting one certificate: %1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;Stop trusting it&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>信任一個憑證：%1 &amp;nbsp; &lt;a href=&quot;forget&quot;&gt;停止信任它&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="963"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
         <source>Check the user name and password.</source>
-        <translation type="unfinished"></translation>
+        <translation>請檢查使用者名稱和密碼。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="966"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="979"/>
         <source>Check the server address for a typo.</source>
-        <translation type="unfinished"></translation>
+        <translation>請檢查伺服器位址是否拼寫錯誤。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="970"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="983"/>
         <source>The address resolves but nothing answered. Check the connection type, and whether the server is reachable from here.</source>
-        <translation type="unfinished"></translation>
+        <translation>位址可解析，但沒有任何回應。請檢查連線類型，以及伺服器是否可從此處連線。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="976"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="989"/>
         <source>The server&apos;s certificate is not signed by an authority this computer trusts. If you run this server yourself, you can choose to trust its certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器的憑證未由這台電腦信任的憑證授權機構簽署。如果您自己執行此伺服器，可以選擇信任其憑證。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="982"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="995"/>
         <source>The server&apos;s certificate is expired or not yet valid. Check the clock on both machines before anything else.</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器的憑證已過期或尚未生效。請先檢查兩台機器上的時鐘。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="987"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1000"/>
         <source>The server&apos;s certificate is for a different host. Check the server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器的憑證屬於不同的主機。請檢查伺服器位址。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="992"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1005"/>
         <source>The server would not start an encrypted session. Nothing was sent to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器無法啟動加密工作階段。未傳送任何資料給它。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="996"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1009"/>
         <source>The encrypted connection could not be established.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法建立加密連線。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="999"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1012"/>
         <source>The server stopped answering. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器停止回應。請重試。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1002"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1015"/>
         <source>This is a fault in GpgFrontend rather than in the server.</source>
-        <translation type="unfinished"></translation>
+        <translation>這是 GpgFrontend 的錯誤，而非伺服器的問題。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1011"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1024"/>
         <source>This may be temporary. Try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>這可能是暫時性的。請重試。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1041"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1059"/>
         <source>This server presented a certificate that no authority vouches for. That is normal for a server you run yourself, and it is also what an interception looks like.
 
 %1
 SHA-256: %2
 
 Trust this exact certificate for this account? Any other certificate, including a later replacement of this one, will still be refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>此伺服器出示的憑證沒有權威機構擔保。這對於您自行執行的伺服器是正常的，同時也是攔截攻擊的樣貌。
+
+%1
+SHA-256: %2
+
+要信任此帳戶的這份確切憑證嗎？任何其他憑證，包括此憑證的後續替換版本，仍將被拒絕。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1047"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1065"/>
         <source>(no certificate details)</source>
-        <translation type="unfinished"></translation>
+        <translation>（無憑證詳細資料）</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1050"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1068"/>
         <source>Trust This Certificate?</source>
-        <translation type="unfinished"></translation>
+        <translation>信任此憑證？</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1063"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1081"/>
         <source>Certificate trusted for this account. Test again to confirm.</source>
-        <translation type="unfinished"></translation>
+        <translation>已信任此帳戶的憑證。請再次測試以確認。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1089"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1107"/>
         <source>Enter a server address first.</source>
-        <translation type="unfinished"></translation>
+        <translation>請先輸入伺服器位址。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1102"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1121"/>
         <source>Enter a password first.</source>
-        <translation type="unfinished"></translation>
+        <translation>請先輸入密碼。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1110"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1129"/>
         <source>Testing...</source>
-        <translation type="unfinished"></translation>
+        <translation>測試中...</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1218"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1237"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1226"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1245"/>
         <source>Connected successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>連線成功。</translation>
     </message>
     <message>
-        <location filename="../EMailAccountSettingsPage.cpp" line="1231"/>
+        <location filename="../EMailAccountSettingsPage.cpp" line="1250"/>
         <source>Could not connect, and the reason is not known.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線，原因不明。</translation>
     </message>
 </context>
 <context>
@@ -347,47 +358,47 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailHeaderView.cpp" line="77"/>
         <source>Filter headers</source>
-        <translation type="unfinished"></translation>
+        <translation>篩選標頭</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="79"/>
         <source>Show only the headers whose name or value contains this text.</source>
-        <translation type="unfinished"></translation>
+        <translation>僅顯示名稱或值包含此文字的標頭。</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="85"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>值</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="137"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>複製值</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="138"/>
         <source>Copy Whole Field</source>
-        <translation type="unfinished"></translation>
+        <translation>複製整個欄位</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="179"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有開啟的郵件。</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="206"/>
         <source>(malformed)</source>
-        <translation type="unfinished"></translation>
+        <translation>(格式錯誤)</translation>
     </message>
     <message>
         <location filename="../EMailHeaderView.cpp" line="256"/>
         <source>This message has no headers to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>此郵件沒有可顯示的標頭。</translation>
     </message>
 </context>
 <context>
@@ -395,275 +406,277 @@ Trust this exact certificate for this account? Any other certificate, including
     <message>
         <location filename="../EMailImapController.cpp" line="151"/>
         <source>IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP 控制器</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="193"/>
         <source>No mail account with IMAP enabled is configured yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>尚未設定啟用 IMAP 的郵件帳戶。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="200"/>
         <source>No configured account can be opened. Check Settings, under Mail Accounts.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟任何已設定的帳戶。請在「設定」的「郵件帳戶」下檢查。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="224"/>
         <source>IMAP is turned off for this account</source>
-        <translation type="unfinished"></translation>
+        <translation>此帳戶已關閉 IMAP</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="226"/>
         <source>no server is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>未設定伺服器</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="228"/>
         <source>no username is configured</source>
-        <translation type="unfinished"></translation>
+        <translation>未設定使用者名稱</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="233"/>
         <location filename="../EMailImapController.cpp" line="696"/>
         <source>no password is stored</source>
-        <translation type="unfinished"></translation>
+        <translation>未儲存密碼</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="265"/>
         <source>This account could not be opened: %1.
 
 Use Refresh to try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟此帳戶：%1。
+
+請使用「重新整理」再試一次。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="268"/>
         <location filename="../EMailImapController.cpp" line="684"/>
         <source>This account cannot be opened: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟此帳戶：%1。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="303"/>
         <source>Search subject or sender</source>
-        <translation type="unfinished"></translation>
+        <translation>搜尋主旨或寄件者</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="312"/>
         <source>Reload this folder from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>從伺服器重新載入此資料夾</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="568"/>
         <source>Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>資料夾</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="392"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>上一封</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="314"/>
         <source>&amp;Account</source>
-        <translation type="unfinished"></translation>
+        <translation>帳戶(&amp;A)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="317"/>
         <source>F&amp;older</source>
-        <translation type="unfinished"></translation>
+        <translation>資料夾(&amp;O)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="393"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>下一封</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="396"/>
         <location filename="../EMailImapController.cpp" line="853"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="398"/>
-        <location filename="../EMailImapController.cpp" line="1416"/>
+        <location filename="../EMailImapController.cpp" line="1418"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>關閉</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="474"/>
         <source>Select a message to see its details.</source>
-        <translation type="unfinished"></translation>
+        <translation>選取一封郵件以查看其詳細資料。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="562"/>
         <source>Copy the whole Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>複製完整 Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="565"/>
         <source>Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="676"/>
         <source>Choose an account to open.</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>此帳戶未儲存密碼。請在「設定」的「郵件帳戶」中設定密碼，然後使用「重試」。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="716"/>
         <source>Connecting...</source>
-        <translation type="unfinished"></translation>
+        <translation>連線中...</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="857"/>
         <source>Copy Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>複製主旨</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="859"/>
         <source>Copy Sender</source>
-        <translation type="unfinished"></translation>
+        <translation>複製寄件者</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="861"/>
         <source>Copy Message-ID</source>
-        <translation type="unfinished"></translation>
+        <translation>複製 Message-ID</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="941"/>
-        <location filename="../EMailImapController.cpp" line="1355"/>
+        <location filename="../EMailImapController.cpp" line="1357"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(無主旨)</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="950"/>
         <source>Date not stated</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>此郵件超過本應用程式可開啟的大小，因此無法匯入。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="967"/>
         <source>Shown from the previous visit to this account; refreshing.</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示上次造訪此帳戶時的內容；正在重新整理。</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="989"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>無</translation>
     </message>
     <message>
         <location filename="../EMailImapController.cpp" line="1061"/>
         <source>Searching...</source>
-        <translation type="unfinished"></translation>
+        <translation>搜尋中...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1107"/>
+        <location filename="../EMailImapController.cpp" line="1109"/>
         <source>Loading messages...</source>
-        <translation type="unfinished"></translation>
+        <translation>載入郵件中...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1119"/>
+        <location filename="../EMailImapController.cpp" line="1121"/>
         <source>Loading folders...</source>
-        <translation type="unfinished"></translation>
+        <translation>載入資料夾中...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1144"/>
+        <location filename="../EMailImapController.cpp" line="1146"/>
         <source>This account has no folders that can be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>此帳戶沒有可開啟的資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1208"/>
+        <location filename="../EMailImapController.cpp" line="1210"/>
         <source>Showing the first %1 matches; narrow the search to see fewer.</source>
-        <translation type="unfinished"></translation>
+        <translation>正在顯示前 %1 筆相符結果；縮小搜尋範圍以減少結果。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1211"/>
+        <location filename="../EMailImapController.cpp" line="1213"/>
         <source>%1 matches.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 筆相符結果。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1223"/>
+        <location filename="../EMailImapController.cpp" line="1225"/>
         <source>Page %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>第 %1 頁，共 %2 頁</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1226"/>
-        <location filename="../EMailImapController.cpp" line="1383"/>
+        <location filename="../EMailImapController.cpp" line="1228"/>
+        <location filename="../EMailImapController.cpp" line="1385"/>
         <source>This folder is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>此資料夾為空。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1227"/>
+        <location filename="../EMailImapController.cpp" line="1229"/>
         <source>%1-%2 of %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-%2，共 %3 項</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1239"/>
+        <location filename="../EMailImapController.cpp" line="1241"/>
         <source>That message came back empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>該郵件內容為空。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1251"/>
+        <location filename="../EMailImapController.cpp" line="1253"/>
         <source>Opened in a new tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>已在新分頁中開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1260"/>
+        <location filename="../EMailImapController.cpp" line="1262"/>
         <source>Downloading message, %1 of %2...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在下載郵件，第 %1 封，共 %2 封...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1275"/>
+        <location filename="../EMailImapController.cpp" line="1277"/>
         <source>Stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1286"/>
+        <location filename="../EMailImapController.cpp" line="1288"/>
         <source>the password was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼被拒絕</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1289"/>
+        <location filename="../EMailImapController.cpp" line="1291"/>
         <source>the server was not found</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到伺服器</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1303"/>
+        <location filename="../EMailImapController.cpp" line="1305"/>
         <source>the secure connection was refused</source>
-        <translation type="unfinished"></translation>
+        <translation>安全連線被拒絕</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1319"/>
+        <location filename="../EMailImapController.cpp" line="1321"/>
         <source>Downloading message...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在下載郵件...</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1349"/>
+        <location filename="../EMailImapController.cpp" line="1351"/>
         <source>Unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>未知寄件者</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1380"/>
+        <location filename="../EMailImapController.cpp" line="1382"/>
         <source>No message in this folder matches that search.</source>
-        <translation type="unfinished"></translation>
+        <translation>此資料夾中沒有郵件符合該搜尋。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1382"/>
+        <location filename="../EMailImapController.cpp" line="1384"/>
         <source>Choose a folder to see the messages in it.</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇一個資料夾以查看其中的郵件。</translation>
     </message>
     <message>
-        <location filename="../EMailImapController.cpp" line="1408"/>
+        <location filename="../EMailImapController.cpp" line="1410"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
 </context>
 <context>
@@ -736,7 +749,7 @@ Use Refresh to try again.</source>
 <context>
     <name>EMailModule</name>
     <message>
-        <location filename="../EMailModule.cpp" line="542"/>
+        <location filename="../EMailModule.cpp" line="558"/>
         <source># EML Data Error
 
 The provided EML data does not conform to RFC 3156 standards and cannot be processed.
@@ -767,7 +780,7 @@ EML 是一種用於表示電子郵件訊息的檔案格式，通常包含標頭�
 修正 EML 資料後，請再次嘗試操作。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="567"/>
+        <location filename="../EMailModule.cpp" line="583"/>
         <source># Email Operation Error
 
 An error occurred during the email operation. The process could not be completed.
@@ -810,60 +823,60 @@ If the issue persists, consider seeking technical support or consulting the docu
 若問題持續發生，請尋求技術支援或查閱文件。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="105"/>
-        <location filename="../EMailModule.cpp" line="872"/>
-        <location filename="../EMailModule.cpp" line="1031"/>
-        <location filename="../EMailModule.cpp" line="1720"/>
+        <location filename="../EMailModule.cpp" line="107"/>
+        <location filename="../EMailModule.cpp" line="888"/>
+        <location filename="../EMailModule.cpp" line="1047"/>
+        <location filename="../EMailModule.cpp" line="1773"/>
         <source>From</source>
         <translation>寄件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="104"/>
+        <location filename="../EMailModule.cpp" line="106"/>
         <source>E-Mail</source>
         <translation>電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="106"/>
-        <location filename="../EMailModule.cpp" line="875"/>
-        <location filename="../EMailModule.cpp" line="1034"/>
-        <location filename="../EMailModule.cpp" line="1723"/>
+        <location filename="../EMailModule.cpp" line="108"/>
+        <location filename="../EMailModule.cpp" line="891"/>
+        <location filename="../EMailModule.cpp" line="1050"/>
+        <location filename="../EMailModule.cpp" line="1776"/>
         <source>To</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="107"/>
-        <location filename="../EMailModule.cpp" line="879"/>
-        <location filename="../EMailModule.cpp" line="1038"/>
-        <location filename="../EMailModule.cpp" line="1727"/>
+        <location filename="../EMailModule.cpp" line="109"/>
+        <location filename="../EMailModule.cpp" line="895"/>
+        <location filename="../EMailModule.cpp" line="1054"/>
+        <location filename="../EMailModule.cpp" line="1780"/>
         <source>Subject</source>
         <translation>主旨</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="108"/>
-        <location filename="../EMailModule.cpp" line="882"/>
-        <location filename="../EMailModule.cpp" line="1041"/>
-        <location filename="../EMailModule.cpp" line="1730"/>
+        <location filename="../EMailModule.cpp" line="110"/>
+        <location filename="../EMailModule.cpp" line="898"/>
+        <location filename="../EMailModule.cpp" line="1057"/>
+        <location filename="../EMailModule.cpp" line="1783"/>
         <source>CC</source>
         <translation>副本</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="109"/>
-        <location filename="../EMailModule.cpp" line="885"/>
-        <location filename="../EMailModule.cpp" line="1044"/>
-        <location filename="../EMailModule.cpp" line="1733"/>
+        <location filename="../EMailModule.cpp" line="111"/>
+        <location filename="../EMailModule.cpp" line="901"/>
+        <location filename="../EMailModule.cpp" line="1060"/>
+        <location filename="../EMailModule.cpp" line="1786"/>
         <source>BCC</source>
         <translation>密件副本</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="110"/>
-        <location filename="../EMailModule.cpp" line="888"/>
-        <location filename="../EMailModule.cpp" line="1047"/>
-        <location filename="../EMailModule.cpp" line="1736"/>
+        <location filename="../EMailModule.cpp" line="112"/>
+        <location filename="../EMailModule.cpp" line="904"/>
+        <location filename="../EMailModule.cpp" line="1063"/>
+        <location filename="../EMailModule.cpp" line="1789"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="117"/>
+        <location filename="../EMailModule.cpp" line="119"/>
         <source>OpenPGP</source>
         <translation>OpenPGP</translation>
     </message>
@@ -876,201 +889,211 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">訊息完整性檢查演算法</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="121"/>
-        <location filename="../EMailModule.cpp" line="897"/>
-        <location filename="../EMailModule.cpp" line="1745"/>
+        <location filename="../EMailModule.cpp" line="123"/>
+        <location filename="../EMailModule.cpp" line="913"/>
+        <location filename="../EMailModule.cpp" line="1808"/>
         <source>Digest of Signed MIME Entity (SHA-256)</source>
-        <translation type="unfinished"></translation>
+        <translation>已簽署 MIME 實體摘要 (SHA-256)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="124"/>
-        <location filename="../EMailModule.cpp" line="902"/>
-        <location filename="../EMailModule.cpp" line="1750"/>
+        <location filename="../EMailModule.cpp" line="126"/>
+        <location filename="../EMailModule.cpp" line="918"/>
+        <location filename="../EMailModule.cpp" line="1813"/>
         <source>Declared Signature Hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>宣告的簽章雜湊值 (micalg)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="161"/>
+        <location filename="../EMailModule.cpp" line="162"/>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>附件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="226"/>
+        <location filename="../EMailModule.cpp" line="227"/>
         <source>Encryption Recipient</source>
         <translation>加密收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="227"/>
+        <location filename="../EMailModule.cpp" line="228"/>
         <source>Recipient</source>
         <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="228"/>
+        <location filename="../EMailModule.cpp" line="229"/>
         <source>Key ID</source>
         <translation>金鑰 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="282"/>
+        <location filename="../EMailModule.cpp" line="283"/>
         <source>encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>加密至</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="294"/>
+        <location filename="../EMailModule.cpp" line="295"/>
         <source>encrypted to, not in the headers</source>
-        <translation type="unfinished"></translation>
+        <translation>加密至（不在標頭中）</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="299"/>
+        <location filename="../EMailModule.cpp" line="300"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="300"/>
+        <location filename="../EMailModule.cpp" line="301"/>
         <source>the sender withheld this key id</source>
-        <translation type="unfinished"></translation>
+        <translation>寄件者未提供此金鑰 ID</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="308"/>
+        <location filename="../EMailModule.cpp" line="309"/>
         <source>Recipient Check</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者檢查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="356"/>
+        <location filename="../EMailModule.cpp" line="357"/>
         <source>DETAILS</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="357"/>
+        <location filename="../EMailModule.cpp" line="358"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="359"/>
+        <location filename="../EMailModule.cpp" line="360"/>
         <source>RECIPIENT</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="361"/>
+        <location filename="../EMailModule.cpp" line="362"/>
         <source>Sign</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="364"/>
+        <location filename="../EMailModule.cpp" line="365"/>
         <source>Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>驗證</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="366"/>
+        <location filename="../EMailModule.cpp" line="367"/>
         <source>SIGNER</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署者</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="511"/>
+        <location filename="../EMailModule.cpp" line="523"/>
         <source>Check before exporting</source>
-        <translation type="unfinished"></translation>
+        <translation>匯出前檢查</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="512"/>
+        <location filename="../EMailModule.cpp" line="524"/>
         <source>Something about this message is worth checking before you save it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息在儲存前有值得檢查的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="910"/>
-        <location filename="../EMailModule.cpp" line="1758"/>
+        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="1822"/>
         <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>
+        <translation>**注意**：簽署的部分並非規範形式，因為其行結尾不是 CRLF。此訊息在簽署後曾被重寫，通常是某個程式在儲存或複製時變更了行結尾。簽章無法針對這些位元組進行驗證，匯入寄件者的金鑰也不會改變這一點。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="832"/>
-        <location filename="../EMailModule.cpp" line="926"/>
+        <location filename="../EMailModule.cpp" line="848"/>
+        <location filename="../EMailModule.cpp" line="942"/>
         <source>Verify E-Mail</source>
         <translation>驗證電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="151"/>
+        <location filename="../EMailModule.cpp" line="152"/>
         <source>, an OpenPGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>，一個 OpenPGP 金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="154"/>
+        <location filename="../EMailModule.cpp" line="155"/>
         <source>, not covered by the signature</source>
-        <translation type="unfinished"></translation>
+        <translation>，未受簽章涵蓋</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="288"/>
+        <location filename="../EMailModule.cpp" line="289"/>
         <source>in %1, but not encrypted to it: cannot read</source>
-        <translation type="unfinished"></translation>
+        <translation>在 %1 中，但未加密給它：無法讀取</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="986"/>
-        <location filename="../EMailModule.cpp" line="1061"/>
+        <location filename="../EMailModule.cpp" line="1002"/>
+        <location filename="../EMailModule.cpp" line="1077"/>
         <source>Decrypt E-Mail</source>
         <translation>解密電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1129"/>
-        <location filename="../EMailModule.cpp" line="1194"/>
-        <location filename="../EMailModule.cpp" line="1250"/>
-        <location filename="../EMailModule.cpp" line="1278"/>
+        <location filename="../EMailModule.cpp" line="1145"/>
+        <location filename="../EMailModule.cpp" line="1210"/>
+        <location filename="../EMailModule.cpp" line="1266"/>
+        <location filename="../EMailModule.cpp" line="1294"/>
         <source>Sign E-Mail</source>
         <translation>簽署電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1331"/>
-        <location filename="../EMailModule.cpp" line="1399"/>
-        <location filename="../EMailModule.cpp" line="1444"/>
-        <location filename="../EMailModule.cpp" line="1474"/>
+        <location filename="../EMailModule.cpp" line="1347"/>
+        <location filename="../EMailModule.cpp" line="1415"/>
+        <location filename="../EMailModule.cpp" line="1460"/>
+        <location filename="../EMailModule.cpp" line="1490"/>
         <source>Encrypt E-Mail</source>
         <translation>加密電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1616"/>
-        <location filename="../EMailModule.cpp" line="1649"/>
+        <location filename="../EMailModule.cpp" line="1632"/>
+        <location filename="../EMailModule.cpp" line="1665"/>
         <source>Encrypt and Sign E-Mail</source>
         <translation>加密並簽署電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1779"/>
+        <location filename="../EMailModule.cpp" line="1703"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Decrypt and Verify E-Mail</source>
         <translation>解密並驗證電子郵件</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1837"/>
+        <location filename="../EMailModule.cpp" line="1901"/>
         <source>Save file</source>
         <translation>儲存檔案</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1839"/>
+        <location filename="../EMailModule.cpp" line="1903"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>電子郵件訊息 (*.eml);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1893"/>
-        <location filename="../EMailModule.cpp" line="1907"/>
-        <location filename="../EMailModule.cpp" line="1946"/>
-        <location filename="../EMailModule.cpp" line="1957"/>
-        <location filename="../EMailModule.cpp" line="1990"/>
-        <location filename="../EMailModule.cpp" line="2004"/>
+        <location filename="../EMailModule.cpp" line="501"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1894"/>
-        <location filename="../EMailModule.cpp" line="1908"/>
+        <location filename="../EMailModule.cpp" line="1968"/>
+        <location filename="../EMailModule.cpp" line="1980"/>
         <source>Cannot write file %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法寫入檔案 %1：
+%2。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1947"/>
+        <location filename="../EMailModule.cpp" line="2023"/>
         <source>%1 is not an ordinary file, so it cannot be opened as a message.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 不是一般檔案，因此無法作為訊息開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="1958"/>
-        <location filename="../EMailModule.cpp" line="2005"/>
+        <location filename="../EMailModule.cpp" line="2033"/>
         <source>The file %1 is too large (%2) to be opened. The maximum allowed size is %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>檔案 %1 太大（%2），無法開啟。允許的最大容量為 %3。</translation>
     </message>
     <message>
         <source>Cannot read file%1:
@@ -1083,7 +1106,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="1991"/>
+        <location filename="../EMailModule.cpp" line="2044"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>無法讀取檔案 %1：
@@ -1095,428 +1118,427 @@ If the issue persists, consider seeking technical support or consulting the docu
     <message>
         <location filename="../EMailPageView.cpp" line="518"/>
         <source>separate several addresses with &quot;;&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>以「;」分隔多個地址</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="543"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation>寄件者:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="556"/>
         <source>Cc/Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>副本/密件副本</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="565"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="566"/>
         <source>Cc:</source>
-        <translation type="unfinished"></translation>
+        <translation>副本:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="567"/>
         <source>Bcc:</source>
-        <translation type="unfinished"></translation>
+        <translation>密件副本:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="578"/>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>主旨:</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="711"/>
         <source>Send...</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="712"/>
         <source>Send this message through a configured mail account.</source>
-        <translation type="unfinished"></translation>
+        <translation>透過已設定的郵件帳號傳送此訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="789"/>
         <location filename="../EMailPageView.cpp" line="1266"/>
         <source>Write your message here.</source>
-        <translation type="unfinished"></translation>
+        <translation>在此輸入您的訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="908"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>將一或多個檔案新增至此訊息。也可以將檔案拖曳到訊息上。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="916"/>
         <source>Take the selected attachments out of this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>將選取的附件從此訊息中移除。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="919"/>
         <source>Write the selected attachments to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>將選取的附件寫入資料夾。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Write every attachment to a folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>將所有附件寫入資料夾。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1177"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已加密。編輯前請先解密。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1181"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已加密並簽署。編輯前請先解密，然後移除簽章。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>原始來源</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1495"/>
         <source>Protected Message</source>
-        <translation type="unfinished"></translation>
+        <translation>受保護的訊息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1496"/>
         <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>
+        <translation>這些位元組受簽章保護，或為密文。編輯其來源前，請先移除簽章或解密訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1518"/>
         <source>Stop Editing</source>
-        <translation type="unfinished"></translation>
+        <translation>停止編輯</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1519"/>
         <source>Edit Raw Source</source>
-        <translation type="unfinished"></translation>
+        <translation>編輯原始來源</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1525"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
-        <translation type="unfinished"></translation>
+        <translation>您正在編輯原始訊息來源。您在此輸入的內容即為文件。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1532"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已鎖定以供檢視。其來源無法編輯。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1541"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>唯讀。解鎖後即可直接編輯訊息來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1780"/>
-        <location filename="../EMailPageView.cpp" line="1829"/>
+        <location filename="../EMailPageView.cpp" line="1787"/>
+        <location filename="../EMailPageView.cpp" line="1836"/>
         <source>This message is encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>此郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1808"/>
-        <location filename="../EMailPageView.cpp" line="2436"/>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailPageView.cpp" line="1815"/>
+        <location filename="../EMailPageView.cpp" line="2478"/>
+        <location filename="../EMailPageView.cpp" line="2489"/>
         <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1828"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>This message is encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>此郵件已加密並簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1852"/>
+        <location filename="../EMailPageView.cpp" line="1859"/>
         <source>The recipients are not named in the headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者未在標頭中指名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1853"/>
+        <location filename="../EMailPageView.cpp" line="1860"/>
         <source>Addressed to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1923"/>
+        <location filename="../EMailPageView.cpp" line="1930"/>
         <source>attach a public key</source>
-        <translation type="unfinished"></translation>
+        <translation>附加公鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1944"/>
+        <location filename="../EMailPageView.cpp" line="1951"/>
         <source>add text to this message</source>
-        <translation type="unfinished"></translation>
+        <translation>新增文字至此郵件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1961"/>
+        <location filename="../EMailPageView.cpp" line="1968"/>
         <source>Message Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>郵件已鎖定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1962"/>
+        <location filename="../EMailPageView.cpp" line="1969"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>此郵件僅供檢視，因此無法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1971"/>
+        <location filename="../EMailPageView.cpp" line="1978"/>
         <source>Message Is Encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1972"/>
+        <location filename="../EMailPageView.cpp" line="1979"/>
         <source>Decrypt this message before trying to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>請先解密此郵件，再嘗試%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1980"/>
+        <location filename="../EMailPageView.cpp" line="1987"/>
         <source>Message Is Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>郵件已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2030"/>
+        <location filename="../EMailPageView.cpp" line="2037"/>
         <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>
+        <translation>這是您仍在撰寫的草稿，不是已收到的訊息，因此這裡還沒有任何可處理的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2059"/>
+        <location filename="../EMailPageView.cpp" line="2066"/>
         <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>
+        <translation>此訊息本來就無法編輯：它已簽署或加密，因此已受到保護，無法被改寫。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2172"/>
+        <location filename="../EMailPageView.cpp" line="2179"/>
         <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>
+        <translation>尚未設定郵件帳戶。請在「設定」的「郵件帳戶」下新增一個帳戶，即可傳送此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2175"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>Fill in who this message is from.</source>
-        <translation type="unfinished"></translation>
+        <translation>請填寫此訊息的寄件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2177"/>
+        <location filename="../EMailPageView.cpp" line="2184"/>
         <source>The From address does not look like an e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>寄件人地址看起來不像電子郵件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2179"/>
+        <location filename="../EMailPageView.cpp" line="2186"/>
         <source>Add at least one recipient.</source>
-        <translation type="unfinished"></translation>
+        <translation>請至少新增一位收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2181"/>
+        <location filename="../EMailPageView.cpp" line="2188"/>
         <source>Give this message a subject.</source>
-        <translation type="unfinished"></translation>
+        <translation>請為此訊息填寫主旨。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2190"/>
+        <location filename="../EMailPageView.cpp" line="2197"/>
         <source>This does not look like an e-mail address: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>這看起來不像電子郵件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2284"/>
+        <location filename="../EMailPageView.cpp" line="2305"/>
         <source>Encrypted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2292"/>
-        <source>Encrypted and signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2338"/>
         <source>Malformed OpenPGP structure</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP 結構格式錯誤</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2303"/>
+        <location filename="../EMailPageView.cpp" line="2345"/>
         <source>Not signed or encrypted</source>
-        <translation type="unfinished"></translation>
+        <translation>未簽署且未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2401"/>
+        <location filename="../EMailPageView.cpp" line="2443"/>
         <source>This message is locked for inspection.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已鎖定，僅供檢視。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2416"/>
+        <location filename="../EMailPageView.cpp" line="2458"/>
         <source>Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2417"/>
+        <location filename="../EMailPageView.cpp" line="2459"/>
         <source>Encrypt...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailPageView.cpp" line="2460"/>
         <source>Encrypt and Sign...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密並簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2422"/>
+        <location filename="../EMailPageView.cpp" line="2464"/>
         <source>Verify Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>驗證簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2423"/>
+        <location filename="../EMailPageView.cpp" line="2465"/>
         <source>Signature Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2427"/>
+        <location filename="../EMailPageView.cpp" line="2469"/>
         <source>Sign Again With Another Key...</source>
-        <translation type="unfinished"></translation>
+        <translation>使用另一個金鑰重新簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2428"/>
-        <location filename="../EMailPageView.cpp" line="2453"/>
+        <location filename="../EMailPageView.cpp" line="2470"/>
+        <location filename="../EMailPageView.cpp" line="2495"/>
         <source>Remove Signature...</source>
-        <translation type="unfinished"></translation>
+        <translation>移除簽章...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2437"/>
-        <location filename="../EMailPageView.cpp" line="2446"/>
+        <location filename="../EMailPageView.cpp" line="2479"/>
+        <location filename="../EMailPageView.cpp" line="2488"/>
         <source>Decrypt and Verify</source>
-        <translation type="unfinished"></translation>
+        <translation>解密並驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailPageView.cpp" line="2481"/>
         <source>Encryption Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>加密詳細資料...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="746"/>
-        <location filename="../EMailPageView.cpp" line="2449"/>
+        <location filename="../EMailPageView.cpp" line="2491"/>
         <source>Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2463"/>
+        <location filename="../EMailPageView.cpp" line="2505"/>
         <source>Decrypt this message first.</source>
-        <translation type="unfinished"></translation>
+        <translation>請先解密此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2472"/>
+        <location filename="../EMailPageView.cpp" line="2514"/>
         <source>What Is Wrong With This Message?</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息有什麼問題？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2476"/>
+        <location filename="../EMailPageView.cpp" line="2518"/>
         <source>Try to Verify Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍嘗試驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2477"/>
+        <location filename="../EMailPageView.cpp" line="2519"/>
         <source>Try to Decrypt Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍嘗試解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2492"/>
+        <location filename="../EMailPageView.cpp" line="2534"/>
         <source>Signature Not Reachable</source>
-        <translation type="unfinished"></translation>
+        <translation>無法取得簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2493"/>
+        <location filename="../EMailPageView.cpp" line="2535"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章位於此訊息的加密部分。請先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2497"/>
+        <location filename="../EMailPageView.cpp" line="2539"/>
         <source>Nothing to Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有可移除的簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2498"/>
+        <location filename="../EMailPageView.cpp" line="2540"/>
         <source>This message carries no signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息沒有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2502"/>
+        <location filename="../EMailPageView.cpp" line="2544"/>
         <source>Cannot Remove the Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>無法移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2503"/>
+        <location filename="../EMailPageView.cpp" line="2545"/>
         <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>
+        <translation>此訊息未充分遵循 RFC 3156，無法安全地移除簽章。請改為編輯原始來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2511"/>
+        <location filename="../EMailPageView.cpp" line="2553"/>
         <source>Remove Signature</source>
-        <translation type="unfinished"></translation>
+        <translation>移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2512"/>
+        <location filename="../EMailPageView.cpp" line="2554"/>
         <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>
+        <translation>從此訊息移除簽章？
+
+簽章將被丟棄，訊息將變成一般未簽署的訊息。訊息本身會保持原樣。此操作無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2617"/>
+        <location filename="../EMailPageView.cpp" line="2668"/>
         <source>signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2624"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation>未簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2761"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>Cannot send</source>
-        <translation type="unfinished"></translation>
+        <translation>無法傳送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2762"/>
+        <location filename="../EMailPageView.cpp" line="2827"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息需要有寄件者和至少一位收件者才能傳送。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>類型</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Message</source>
-        <translation type="unfinished">訊息</translation>
+        <translation>訊息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="382"/>
         <source>Structure</source>
-        <translation type="unfinished"></translation>
+        <translation>結構</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="381"/>
         <source>Security</source>
-        <translation type="unfinished"></translation>
+        <translation>安全性</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="362"/>
         <source>Message Details</source>
-        <translation type="unfinished"></translation>
+        <translation>訊息詳細資料</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="383"/>
         <source>Headers</source>
-        <translation type="unfinished"></translation>
+        <translation>標頭</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="524"/>
         <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>
+        <translation>%1。
+
+密件收件者永遠不會被寫入訊息中：Bcc 標頭會讓所有收件者得知誰被密件副本。密件收件者只用來選擇加密收件者，且不會隨檔案儲存。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="561"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示副本與密件副本 (%1)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="624"/>
@@ -1524,348 +1546,421 @@ Blind recipients are never written into the message: a Bcc header would tell eve
         <location filename="../EMailPageView.cpp" line="750"/>
         <location filename="../EMailPageView.cpp" line="900"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="633"/>
         <source>Show the message</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示訊息</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="635"/>
         <source>Show the raw document</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示原始文件</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="687"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>回覆</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="688"/>
         <source>Write a reply to the sender.</source>
-        <translation type="unfinished"></translation>
+        <translation>撰寫回覆給寄件者。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="691"/>
         <source>Reply All</source>
-        <translation type="unfinished"></translation>
+        <translation>全部回覆</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="692"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
-        <translation type="unfinished"></translation>
+        <translation>撰寫回覆給寄件者和所有其他收件者。不包含密件副本收件者。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="696"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>轉寄</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="697"/>
         <source>Pass this message on, with its attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation>轉寄此訊息及其附件。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="728"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>唯讀</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="729"/>
         <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>
+        <translation>鎖定此訊息，使其無法編輯或重寫。回覆和轉寄仍可運作，並產生新訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="751"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示此訊息的已知資訊：簽章、結構和標頭。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>大小</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
-        <location filename="../EMailPageView.cpp" line="2288"/>
         <source>Signed</source>
-        <translation type="unfinished"></translation>
+        <translation>已簽署</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="861"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="907"/>
         <source>Attach File...</source>
-        <translation type="unfinished"></translation>
+        <translation>附加檔案...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="915"/>
-        <location filename="../EMailPageView.cpp" line="3021"/>
+        <location filename="../EMailPageView.cpp" line="3107"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>移除</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="918"/>
-        <location filename="../EMailPageView.cpp" line="3008"/>
+        <location filename="../EMailPageView.cpp" line="3094"/>
         <source>Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="922"/>
         <source>Save All...</source>
-        <translation type="unfinished"></translation>
+        <translation>全部儲存...</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1168"/>
         <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>
+        <translation>此訊息僅供檢視。無法編輯或重寫；回覆和轉寄仍可使用，並會產生新訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1188"/>
         <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>
+        <translation>此訊息已簽署。編輯前請先移除簽章。在簽章下進行編輯會被視為偽造。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1205"/>
         <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>
+        <translation>此訊息以 HTML 撰寫。顯示為原始碼而非轉譯結果：此處不會載入圖片或連結。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1536"/>
+        <location filename="../EMailPageView.cpp" line="1537"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
-        <translation type="unfinished"></translation>
+        <translation>唯讀。這些位元組受到保護。若要編輯，請移除簽章或解密訊息。</translation>
     </message>
     <message>
         <location filename="../EMailPageView.cpp" line="1617"/>
         <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>
+        <translation>此訊息無法組裝以供檢視，因此此處沒有可顯示的內容。訊息本身未變更。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1675"/>
+        <location filename="../EMailPageView.cpp" line="1682"/>
         <source>Cannot Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>無法回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1677"/>
+        <location filename="../EMailPageView.cpp" line="1684"/>
         <source>Cannot Reply to All</source>
-        <translation type="unfinished"></translation>
+        <translation>無法回覆所有人</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1681"/>
+        <location filename="../EMailPageView.cpp" line="1688"/>
         <source>Cannot Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>無法轉寄</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1687"/>
+        <location filename="../EMailPageView.cpp" line="1694"/>
         <source>
 
 This message itself has not been changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息本身並未變更。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1702"/>
+        <location filename="../EMailPageView.cpp" line="1709"/>
         <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>
+        <translation>無法從此處開啟新訊息，因為此檢視不在包含分頁的視窗內。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1729"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <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>
+        <translation>無法組合新訊息。這通常表示原始訊息中有部分無法重新編碼，最常見的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1747"/>
+        <location filename="../EMailPageView.cpp" line="1754"/>
         <source>A tab for the new message could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟新訊息的分頁。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1758"/>
+        <location filename="../EMailPageView.cpp" line="1765"/>
         <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>
+        <translation>新分頁已開啟，但它沒有顯示訊息檢視，因此沒有地方放置回覆。該分頁可以關閉。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1890"/>
+        <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>
+        <translation>收件者未具名，因此是否能開啟此訊息，必須嘗試後才能得知。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1906"/>
+        <location filename="../EMailPageView.cpp" line="1913"/>
         <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>
+        <translation>您未持有這些電子郵件地址中任何一個對應的私鑰。除非此訊息同時也加密到此處未列出的金鑰，否則無法在此電腦上開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1915"/>
+        <location filename="../EMailPageView.cpp" line="1922"/>
         <source>You hold the private key for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>您持有 %1 的私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1916"/>
+        <location filename="../EMailPageView.cpp" line="1923"/>
         <source>You hold private keys for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>您持有 %1 的多把私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1981"/>
+        <location filename="../EMailPageView.cpp" line="1988"/>
         <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>
+        <translation>此訊息已簽署，因此無法變更：在簽章下編輯會被視為偽造。
+
+是否移除簽章並使其成為一般訊息？</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2312"/>
+        <source>Encrypted, signature not checked</source>
+        <translation>已加密，未檢查簽章</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2313"/>
+        <source>Signature not checked</source>
+        <translation>簽章未檢查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2317"/>
+        <source>Encrypted, signature verified</source>
+        <translation>已加密，簽章已驗證</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2318"/>
+        <source>Signature verified</source>
+        <translation>簽章已驗證</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2322"/>
+        <source>Signed by a different address</source>
+        <translation>由不同地址簽署</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2326"/>
+        <source>Signature or key expired</source>
+        <translation>簽章或金鑰已過期</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2330"/>
+        <source>Signed by an unknown key</source>
+        <translation>由未知金鑰簽署</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2334"/>
+        <source>Bad signature</source>
+        <translation>簽章無效</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2671"/>
+        <source>signed, not checked</source>
+        <translation>已簽署，未檢查</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2677"/>
+        <source>signature not good</source>
+        <translation>簽章無效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2640"/>
+        <location filename="../EMailPageView.cpp" line="2705"/>
         <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>
+        <translation>此訊息的某些部分位於簽章區段之外。這些部分不受簽章涵蓋，可能由任何人新增。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2654"/>
+        <location filename="../EMailPageView.cpp" line="2719"/>
         <source>1 attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2655"/>
+        <location filename="../EMailPageView.cpp" line="2720"/>
         <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2710"/>
+        <location filename="../EMailPageView.cpp" line="2775"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>電子郵件訊息 (*.eml);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2892"/>
-        <location filename="../EMailPageView.cpp" line="2938"/>
+        <location filename="../EMailPageView.cpp" line="2957"/>
+        <location filename="../EMailPageView.cpp" line="3024"/>
         <source>Attach Files</source>
-        <translation type="unfinished"></translation>
+        <translation>附加檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2912"/>
+        <location filename="../EMailPageView.cpp" line="2987"/>
         <source>%1 is a folder</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 是資料夾</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2988"/>
+        <source>%1 is not an ordinary file</source>
+        <translation>%1 不是一般檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2918"/>
+        <location filename="../EMailPageView.cpp" line="2993"/>
+        <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"/>
         <source>%1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2940"/>
+        <location filename="../EMailPageView.cpp" line="3026"/>
         <source>Nothing was attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>未附加任何檔案：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2941"/>
+        <location filename="../EMailPageView.cpp" line="3027"/>
         <source>These were not attached:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>以下檔案未附加：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3007"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3016"/>
+        <location filename="../EMailPageView.cpp" line="3102"/>
         <source>Import Key</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3020"/>
+        <location filename="../EMailPageView.cpp" line="3106"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>複製名稱</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3109"/>
-        <location filename="../EMailPageView.cpp" line="3124"/>
-        <location filename="../EMailPageView.cpp" line="3132"/>
+        <location filename="../EMailPageView.cpp" line="3180"/>
+        <location filename="../EMailPageView.cpp" line="3195"/>
+        <location filename="../EMailPageView.cpp" line="3210"/>
+        <location filename="../EMailPageView.cpp" line="3218"/>
         <source>Open Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3095"/>
+        <location filename="../EMailPageView.cpp" line="3181"/>
         <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>
+        <translation>%1 不是此程式會為您開啟的檔案類型，因為開啟它可能代表執行它，或將其交給可能執行的程式。
+
+請改為儲存它，並在確定其來源後自行開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3110"/>
+        <location filename="../EMailPageView.cpp" line="3196"/>
         <source>A temporary folder to open %1 from could not be created.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法建立用來開啟 %1 的暫存資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3211"/>
         <source>%1 could not be written out to be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法將 %1 寫出以開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3133"/>
+        <location filename="../EMailPageView.cpp" line="3219"/>
         <source>Nothing on this system is registered to open %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>此系統上沒有註冊可開啟 %1 的程式。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3168"/>
+        <location filename="../EMailPageView.cpp" line="3254"/>
         <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3169"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>Take out of this message:
 
 %1
 
 This message came from somewhere else, so unless these have been saved already this is the only copy. Removing them cannot be undone.</source>
-        <translation type="unfinished"></translation>
+        <translation>從此訊息中取出：
+
+%1
+
+此訊息來自其他地方，因此除非這些附件已儲存，否則這將是唯一的副本。移除後無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3295"/>
+        <location filename="../EMailPageView.cpp" line="3381"/>
         <source>%1 -&gt; %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3301"/>
+        <location filename="../EMailPageView.cpp" line="3387"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>已儲存。該資料夾中已有部分名稱被使用，因此這些檔案以不同的名稱寫入：
+
+%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3308"/>
+        <location filename="../EMailPageView.cpp" line="3394"/>
         <source>Saved 1 file.</source>
-        <translation type="unfinished"></translation>
+        <translation>已儲存 1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3309"/>
+        <location filename="../EMailPageView.cpp" line="3395"/>
         <source>Saved %1 files.</source>
-        <translation type="unfinished"></translation>
+        <translation>已儲存 %1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3249"/>
-        <location filename="../EMailPageView.cpp" line="3258"/>
+        <location filename="../EMailPageView.cpp" line="3335"/>
+        <location filename="../EMailPageView.cpp" line="3344"/>
         <source>Save Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3259"/>
+        <location filename="../EMailPageView.cpp" line="3345"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法寫入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3265"/>
-        <location filename="../EMailPageView.cpp" line="3282"/>
-        <location filename="../EMailPageView.cpp" line="3300"/>
+        <location filename="../EMailPageView.cpp" line="3351"/>
+        <location filename="../EMailPageView.cpp" line="3368"/>
+        <location filename="../EMailPageView.cpp" line="3386"/>
         <source>Save Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3283"/>
+        <location filename="../EMailPageView.cpp" line="3369"/>
         <source>Could not write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>無法寫入：%1</translation>
     </message>
 </context>
 <context>
@@ -1873,329 +1968,354 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSecurityView.cpp" line="75"/>
         <source>usable</source>
-        <translation type="unfinished"></translation>
+        <translation>可用</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="77"/>
         <source>expiring soon</source>
-        <translation type="unfinished"></translation>
+        <translation>即將過期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="79"/>
         <source>expired</source>
-        <translation type="unfinished"></translation>
+        <translation>已過期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="81"/>
         <source>revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>已吊銷</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="83"/>
         <source>disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>已停用</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="85"/>
         <location filename="../EMailSecurityView.cpp" line="112"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>未知</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="93"/>
         <source>valid</source>
-        <translation type="unfinished"></translation>
+        <translation>有效</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="95"/>
         <source>valid, with issues</source>
-        <translation type="unfinished"></translation>
+        <translation>有效，但有問題</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="97"/>
         <source>valid, key not fully trusted</source>
-        <translation type="unfinished"></translation>
+        <translation>有效，金鑰未完全信任</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="100"/>
         <source>invalid</source>
-        <translation type="unfinished"></translation>
+        <translation>無效</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="102"/>
         <source>public key missing</source>
-        <translation type="unfinished"></translation>
+        <translation>缺少公鑰</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="104"/>
         <source>signing key revoked</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署金鑰已吊銷</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="107"/>
         <source>signature expired</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章已過期</translation>
     </message>
     <message>
         <location filename="../EMailSecurityView.cpp" line="109"/>
         <source>signing key expired</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署金鑰已過期</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="126"/>
+        <source>bad signature: signing key revoked</source>
+        <translation>簽章錯誤：簽署金鑰已吊銷</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="128"/>
+        <source>BAD signature: it does not match these bytes</source>
+        <translation>簽章錯誤：與這些位元組不符</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="132"/>
+        <source>valid, but signed by another address</source>
+        <translation>有效，但由另一個地址簽署</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Item</source>
-        <translation type="unfinished"></translation>
+        <translation>項目</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="153"/>
+        <location filename="../EMailSecurityView.cpp" line="180"/>
         <source>Detail</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="168"/>
-        <location filename="../EMailSecurityView.cpp" line="196"/>
+        <location filename="../EMailSecurityView.cpp" line="195"/>
+        <location filename="../EMailSecurityView.cpp" line="223"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>目前沒有開啟的訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="236"/>
+        <location filename="../EMailSecurityView.cpp" line="263"/>
         <source>Copy Value</source>
-        <translation type="unfinished"></translation>
+        <translation>複製值</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="241"/>
+        <location filename="../EMailSecurityView.cpp" line="268"/>
         <source>Copy Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>複製指紋</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="248"/>
+        <location filename="../EMailSecurityView.cpp" line="275"/>
         <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>複製地址</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="254"/>
+        <location filename="../EMailSecurityView.cpp" line="281"/>
         <source>Import the Key in This Message</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入此訊息中的金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="264"/>
+        <location filename="../EMailSecurityView.cpp" line="291"/>
         <source>Verify Again</source>
-        <translation type="unfinished"></translation>
+        <translation>重新驗證</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="319"/>
+        <location filename="../EMailSecurityView.cpp" line="346"/>
         <source>Signatures</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="323"/>
+        <location filename="../EMailSecurityView.cpp" line="350"/>
         <source>Signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="326"/>
+        <location filename="../EMailSecurityView.cpp" line="353"/>
         <source>covers %1</source>
-        <translation type="unfinished"></translation>
+        <translation>涵蓋 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="327"/>
+        <location filename="../EMailSecurityView.cpp" line="354"/>
         <source>covers %1, nested %2 deep</source>
-        <translation type="unfinished"></translation>
+        <translation>涵蓋 %1，巢狀 %2 層</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="340"/>
+        <location filename="../EMailSecurityView.cpp" line="367"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>結果</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="351"/>
+        <location filename="../EMailSecurityView.cpp" line="378"/>
         <source>this section is signed, but nothing has verified it yet</source>
-        <translation type="unfinished"></translation>
+        <translation>此區段已簽署，但尚未經過驗證</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="352"/>
+        <location filename="../EMailSecurityView.cpp" line="379"/>
         <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>
+        <translation>此區段已簽署，但驗證未產生任何結果：簽署金鑰可能不在您的金鑰環中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="360"/>
+        <location filename="../EMailSecurityView.cpp" line="387"/>
         <source>Unknown signer</source>
-        <translation type="unfinished"></translation>
+        <translation>未知簽署者</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="402"/>
+        <source>Different address</source>
+        <translation>不同地址</translation>
+    </message>
+    <message>
+        <location filename="../EMailSecurityView.cpp" line="405"/>
+        <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="376"/>
+        <location filename="../EMailSecurityView.cpp" line="421"/>
         <source>Public key algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>公鑰演算法</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="377"/>
+        <location filename="../EMailSecurityView.cpp" line="422"/>
         <source>Signed at</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署時間</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="383"/>
+        <location filename="../EMailSecurityView.cpp" line="428"/>
         <source>Declared hash (micalg)</source>
-        <translation type="unfinished"></translation>
+        <translation>宣告的雜湊（micalg）</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="384"/>
+        <location filename="../EMailSecurityView.cpp" line="429"/>
         <source>Signature hash</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章雜湊</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="388"/>
+        <location filename="../EMailSecurityView.cpp" line="433"/>
         <source>Hash mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>雜湊不符</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="390"/>
+        <location filename="../EMailSecurityView.cpp" line="435"/>
         <source>the message declares %1 but the signature used %2</source>
-        <translation type="unfinished"></translation>
+        <translation>訊息宣告 %1，但簽章使用的卻是 %2</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="397"/>
+        <location filename="../EMailSecurityView.cpp" line="442"/>
         <source>Warning</source>
-        <translation type="unfinished">警告</translation>
+        <translation>警告</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="409"/>
+        <location filename="../EMailSecurityView.cpp" line="454"/>
         <source>Recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="416"/>
+        <location filename="../EMailSecurityView.cpp" line="461"/>
         <source>addressed and encrypted to</source>
-        <translation type="unfinished"></translation>
+        <translation>指定收件人並加密給</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="652"/>
+        <location filename="../EMailSecurityView.cpp" line="696"/>
         <source>There is nothing further to report about this message.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息沒有其他需要報告的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="435"/>
+        <location filename="../EMailSecurityView.cpp" line="480"/>
         <source>Key %1</source>
-        <translation type="unfinished"></translation>
+        <translation>金鑰 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="438"/>
+        <location filename="../EMailSecurityView.cpp" line="483"/>
         <source>encrypted to, but not in the visible headers</source>
-        <translation type="unfinished"></translation>
+        <translation>已加密給，但不在可見的標頭中</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="443"/>
+        <location filename="../EMailSecurityView.cpp" line="488"/>
         <source>Hidden recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏收件者</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="445"/>
+        <location filename="../EMailSecurityView.cpp" line="490"/>
         <source>the sender chose not to record who this is</source>
-        <translation type="unfinished"></translation>
+        <translation>寄件者選擇不記錄此身分</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="223"/>
-        <location filename="../EMailSecurityView.cpp" line="226"/>
-        <location filename="../EMailSecurityView.cpp" line="375"/>
-        <location filename="../EMailSecurityView.cpp" line="452"/>
-        <location filename="../EMailSecurityView.cpp" line="515"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>指紋</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="426"/>
+        <location filename="../EMailSecurityView.cpp" line="471"/>
         <source>in %1, but not encrypted to it: they cannot read this</source>
-        <translation type="unfinished"></translation>
+        <translation>位於 %1，但未加密給它：他們無法讀取此內容</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="459"/>
-        <location filename="../EMailSecurityView.cpp" line="540"/>
+        <location filename="../EMailSecurityView.cpp" line="504"/>
+        <location filename="../EMailSecurityView.cpp" line="585"/>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>注意</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="461"/>
+        <location filename="../EMailSecurityView.cpp" line="506"/>
         <source>the engine reported the primary key rather than the encryption subkey actually used</source>
-        <translation type="unfinished"></translation>
+        <translation>引擎回報的是主金鑰，而非實際使用的加密子金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="472"/>
+        <location filename="../EMailSecurityView.cpp" line="517"/>
         <source>Keys for these addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>這些地址的金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="487"/>
+        <location filename="../EMailSecurityView.cpp" line="532"/>
         <source>no key found</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>1 key</source>
-        <translation type="unfinished"></translation>
+        <translation>1 個金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="497"/>
+        <location filename="../EMailSecurityView.cpp" line="542"/>
         <source>%1 keys</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 個金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="508"/>
+        <location filename="../EMailSecurityView.cpp" line="553"/>
         <source>key is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>金鑰為 %1</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="523"/>
+        <location filename="../EMailSecurityView.cpp" line="568"/>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>身分</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="526"/>
+        <location filename="../EMailSecurityView.cpp" line="571"/>
         <source>this address is on a REVOKED user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址位於金鑰的已吊銷使用者 ID 上</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="529"/>
+        <location filename="../EMailSecurityView.cpp" line="574"/>
         <source>this address is the key&apos;s primary user ID</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址是該金鑰的主要使用者 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="534"/>
+        <location filename="../EMailSecurityView.cpp" line="579"/>
         <source>this address is a secondary user ID of the key</source>
-        <translation type="unfinished"></translation>
+        <translation>此地址是該金鑰的次要使用者 ID</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="541"/>
+        <location filename="../EMailSecurityView.cpp" line="586"/>
         <source>this key cannot be used for encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>此金鑰無法用於加密</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="554"/>
+        <location filename="../EMailSecurityView.cpp" line="599"/>
         <source>What stands out</source>
-        <translation type="unfinished"></translation>
+        <translation>顯著特點</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="595"/>
+        <location filename="../EMailSecurityView.cpp" line="639"/>
         <source>This message is not signed or encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息未簽署且未加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="598"/>
+        <location filename="../EMailSecurityView.cpp" line="642"/>
         <source>This message carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息帶有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="601"/>
+        <location filename="../EMailSecurityView.cpp" line="645"/>
         <source>This message is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已加密。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="605"/>
+        <location filename="../EMailSecurityView.cpp" line="649"/>
         <source>This message is encrypted and carries a signature.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息已加密並帶有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailSecurityView.cpp" line="610"/>
+        <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>
+        <translation>此訊息聲稱使用 OpenPGP，但其結構不符合 RFC 3156。</translation>
     </message>
 </context>
 <context>
@@ -2203,282 +2323,282 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailSendDialog.cpp" line="83"/>
         <source>Send message</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送訊息</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="136"/>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(無主旨)</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="141"/>
         <source>Ready to send. Nothing has left this computer yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>準備好傳送。尚無任何資料離開這台電腦。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="160"/>
         <source>Message</source>
-        <translation type="unfinished">訊息</translation>
+        <translation>訊息</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="174"/>
         <source>From</source>
-        <translation type="unfinished">寄件者</translation>
+        <translation>寄件者</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="180"/>
         <source>To</source>
-        <translation type="unfinished">收件者</translation>
+        <translation>收件者</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="181"/>
         <source>No visible recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有可見的收件者</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="187"/>
         <source>Blind copies</source>
-        <translation type="unfinished"></translation>
+        <translation>密件副本</translation>
     </message>
     <message numerus="yes">
         <location filename="../EMailSendDialog.cpp" line="193"/>
         <source>%1, %n attachment(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1，%n 個附件</numerusform>
         </translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="195"/>
         <source>Contains</source>
-        <translation type="unfinished"></translation>
+        <translation>包含</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="218"/>
         <source>Send using</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送方式</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="250"/>
         <source>Result</source>
-        <translation type="unfinished"></translation>
+        <translation>結果</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="282"/>
         <source>Submission</source>
-        <translation type="unfinished"></translation>
+        <translation>提交</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="293"/>
         <source>Copy in Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>在寄件備份中保留副本</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="493"/>
         <source>%1 port %2 · %3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 連接埠 %2 · %3</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="286"/>
         <location filename="../EMailSendDialog.cpp" line="295"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>停止</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="308"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>詳細資料</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="317"/>
         <source>Copy details</source>
-        <translation type="unfinished"></translation>
+        <translation>複製詳細資料</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="366"/>
         <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>
+        <translation>這些地址只會提供給外寄伺服器。它們不會出現在郵件中，因此其他收件者無法看到。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="402"/>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="404"/>
         <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="465"/>
         <source>No outgoing account is configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>未設定任何外寄帳戶。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="483"/>
         <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>
+        <translation>此帳戶未儲存密碼，因此無法透過它傳送任何郵件。請在「設定」的「郵件帳戶」下設定密碼，並開啟記住密碼的選項。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="517"/>
         <location filename="../EMailSendDialog.cpp" line="900"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>關閉</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="518"/>
         <source>Sending. This window will say what happened.</source>
-        <translation type="unfinished"></translation>
+        <translation>正在傳送。此視窗會顯示傳送結果。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="572"/>
         <source>This account is set up for sending only, so there is no mailbox to keep a copy in.</source>
-        <translation type="unfinished"></translation>
+        <translation>此帳戶僅設定為傳送，因此沒有信箱可存放副本。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="649"/>
         <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>
+        <translation>副本已放入 %1，但之後無法查詢：此郵件沒有 Message-ID。完全按原樣傳送的郵件永遠不會獲得 Message-ID，因為加入它會變更簽章可能涵蓋的位元組。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="658"/>
         <source>no Sent folder could be identified for this account.</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到此帳戶的寄件備份資料夾。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="664"/>
         <source>the copy could not be written to the mailbox.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法將副本寫入信箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="665"/>
         <source>the copy could not be written to the mailbox: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>無法將副本寫入信箱：%1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="698"/>
         <source>Stopping...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在停止...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="712"/>
         <source>Still sending</source>
-        <translation type="unfinished"></translation>
+        <translation>仍在傳送</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="713"/>
         <source>This message is still being sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>此郵件仍在傳送中。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="715"/>
         <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>
+        <translation>伺服器可能已接受該郵件。如果您現在關閉此視窗，將無法得知它是否已送達，而且再次傳送可能導致重複送達。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="718"/>
         <source>Keep Waiting</source>
-        <translation type="unfinished"></translation>
+        <translation>繼續等待</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="719"/>
         <source>Close Anyway</source>
-        <translation type="unfinished"></translation>
+        <translation>仍要關閉</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="757"/>
         <source>Not sent yet</source>
-        <translation type="unfinished"></translation>
+        <translation>尚未寄出</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="760"/>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>傳送中...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="764"/>
         <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>
+        <translation>未知。訊息寄出後連線中斷，因此伺服器可能已接受，也可能未接受。再次寄出前，請檢查寄件備份或收件者：重寄可能導致重複投遞。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="770"/>
         <source>Yes, accepted by the outgoing mail server</source>
-        <translation type="unfinished"></translation>
+        <translation>是，外寄郵件伺服器已接受。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="784"/>
         <source>Not saved</source>
-        <translation type="unfinished"></translation>
+        <translation>未儲存</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="789"/>
         <source>Saving a copy to Sent...</source>
-        <translation type="unfinished"></translation>
+        <translation>正在將副本儲存至寄件備份...</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="808"/>
         <source>No copy was kept.</source>
-        <translation type="unfinished"></translation>
+        <translation>未保留任何副本。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="809"/>
         <source>The message was sent, but %1</source>
-        <translation type="unfinished"></translation>
+        <translation>訊息已寄出，但 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="581"/>
         <source>No password is stored for this account, so its mailbox could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>此帳戶未儲存密碼，因此無法開啟其信箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="685"/>
         <source>The mailbox could not be reached.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線到信箱。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="686"/>
         <source>The mailbox could not be reached: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線到信箱：%1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="785"/>
         <source>Waits until the message is sent</source>
-        <translation type="unfinished"></translation>
+        <translation>等待訊息寄出</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="797"/>
         <source>Yes, your mail server had already filed it in %1</source>
-        <translation type="unfinished"></translation>
+        <translation>是的，您的郵件伺服器已將它歸檔於 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="799"/>
         <source>Yes, saved to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>是的，已儲存至 %1</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="814"/>
         <source>Stopped: no copy was kept. The message was still sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>已停止：未保留副本。郵件仍已傳送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="852"/>
         <source>It is not known whether this was sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法確定這封郵件是否已傳送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="854"/>
         <source>Handed to the outgoing mail server.</source>
-        <translation type="unfinished"></translation>
+        <translation>已交至外寄郵件伺服器。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="856"/>
         <source>Not sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>未傳送。</translation>
     </message>
     <message>
         <location filename="../EMailSendDialog.cpp" line="877"/>
         <location filename="../EMailSendDialog.cpp" line="886"/>
         <source>Close (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>關閉 (%1)</translation>
     </message>
 </context>
 <context>
@@ -2486,353 +2606,373 @@ This message came from somewhere else, so unless these have been saved already t
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Part</source>
-        <translation type="unfinished"></translation>
+        <translation>部分</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>大小</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>編碼</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="81"/>
         <source>Covered by</source>
-        <translation type="unfinished"></translation>
+        <translation>涵蓋於</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="90"/>
         <location filename="../EMailStructureView.cpp" line="263"/>
         <source>No message is open.</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有開啟的郵件。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="166"/>
         <source>Save Part...</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存部分...</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="175"/>
         <source>Import This Key</source>
-        <translation type="unfinished"></translation>
+        <translation>匯入此金鑰</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="179"/>
         <source>Copy Content-Type</source>
-        <translation type="unfinished"></translation>
+        <translation>複製內容類型</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="180"/>
         <source>Copy Name</source>
-        <translation type="unfinished"></translation>
+        <translation>複製名稱</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="182"/>
         <source>Copy SHA-256</source>
-        <translation type="unfinished"></translation>
+        <translation>複製 SHA-256</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="216"/>
         <location filename="../EMailStructureView.cpp" line="224"/>
         <source>Save Part</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存部分</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="225"/>
         <source>Cannot write %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法寫入 %1。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="252"/>
         <source>SHA-256 of this part: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>此部分的 SHA-256：%1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="274"/>
         <source>signature %1</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章 %1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="308"/>
         <source>not covered</source>
-        <translation type="unfinished"></translation>
+        <translation>未涵蓋</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="315"/>
         <source>OpenPGP control part</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenPGP 控制部分</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="318"/>
         <source>An OpenPGP key, which can be imported.</source>
-        <translation type="unfinished"></translation>
+        <translation>可匯入的 OpenPGP 金鑰。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="322"/>
         <source>Content-ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Content-ID：%1</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="343"/>
         <source>This message has no parts to show.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息沒有可顯示的部分。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="347"/>
         <source>This message carries no signed section.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息未包含已簽署的區段。</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="355"/>
         <source>Signature %1 covers %2 (declared %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章 %1 涵蓋 %2（宣告為 %3）</translation>
     </message>
     <message>
         <location filename="../EMailStructureView.cpp" line="359"/>
         <source>no algorithm</source>
-        <translation type="unfinished"></translation>
+        <translation>無演算法</translation>
     </message>
 </context>
 <context>
     <name>EMailTransport</name>
     <message>
-        <location filename="../EMailImapWorker.cpp" line="708"/>
+        <location filename="../EMailImapWorker.cpp" line="676"/>
+        <source>That search text cannot be sent</source>
+        <translation>無法傳送該搜尋文字</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="678"/>
+        <source>A search may only contain ordinary ASCII characters, with no line breaks. Try searching for a shorter part of the word.</source>
+        <translation>搜尋只能包含一般 ASCII 字元，且不得含有換行。請嘗試搜尋單字中較短的部分。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="790"/>
+        <source>That message is no longer in this folder</source>
+        <translation>該郵件已不在這個資料夾中</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="792"/>
+        <source>It was moved or deleted after this list was loaded. Refresh the folder to see what is there now.</source>
+        <translation>此郵件已在載入清單後被移動或刪除。請重新整理資料夾以查看目前的內容。</translation>
+    </message>
+    <message>
+        <location filename="../EMailImapWorker.cpp" line="808"/>
         <source>That message is too large to open</source>
-        <translation type="unfinished"></translation>
+        <translation>該郵件太大，無法開啟</translation>
     </message>
 </context>
 <context>
     <name>GTrC</name>
     <message>
-        <location filename="../EMailModule.cpp" line="724"/>
+        <location filename="../EMailModule.cpp" line="740"/>
         <source>Mail Editor</source>
         <translation>電子郵件編輯器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="726"/>
+        <location filename="../EMailModule.cpp" line="742"/>
         <source>Open a new text editor for email.</source>
         <translation>開啟新的電子郵件文字編輯器。</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="750"/>
+        <location filename="../EMailModule.cpp" line="766"/>
         <source>Open IMAP Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟 IMAP 控制器</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="754"/>
+        <location filename="../EMailModule.cpp" line="770"/>
         <source>Open IMAP Controller Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟 IMAP 控制器對話方塊</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="760"/>
+        <location filename="../EMailModule.cpp" line="776"/>
         <source>No mail account</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有郵件帳戶</translation>
     </message>
     <message>
-        <location filename="../EMailModule.cpp" line="761"/>
+        <location filename="../EMailModule.cpp" line="777"/>
         <source>Configure a mail account with IMAP enabled in Settings first.</source>
-        <translation type="unfinished"></translation>
+        <translation>請先在設定中設定已啟用 IMAP 的郵件帳戶。</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1547"/>
+        <location filename="../EMAilHelper.cpp" line="1764"/>
         <source>Signed part no longer in canonical form</source>
-        <translation type="unfinished"></translation>
+        <translation>簽署部分已非標準形式</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1548"/>
+        <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>
+        <translation>簽署部分包含非 CRLF 的行尾，這不是計算簽章所依據的形式。此訊息在簽署後遭到重寫，通常是程式在儲存或複製時變更了行尾，而非攻擊。簽章無法針對這些位元組驗證，匯入寄件者的金鑰也不會改變這一點。檢查時需要原始未修改的訊息。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1569"/>
+        <location filename="../EMAilHelper.cpp" line="1786"/>
         <source>Duplicate %1 header</source>
-        <translation type="unfinished"></translation>
+        <translation>重複的 %1 標頭</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1570"/>
+        <location filename="../EMAilHelper.cpp" line="1787"/>
         <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>
+        <translation>此訊息包含 %1 份只能出現一次的標頭。不同的郵件程式會選取不同的副本，因此您在這裡看到的可能與其他讀者看到的不同。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1583"/>
+        <location filename="../EMAilHelper.cpp" line="1800"/>
         <source>Address may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>地址可能經過偽裝</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1584"/>
+        <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 type="unfinished"></translation>
+        <translation>「%1」中的網域使用了可被繪製成看似另一個熟悉地址的字元。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1598"/>
+        <location filename="../EMAilHelper.cpp" line="1815"/>
         <source>Replies go somewhere else</source>
-        <translation type="unfinished"></translation>
+        <translation>回覆會寄到其他地方</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1599"/>
+        <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="unfinished"></translation>
+        <translation>此訊息來自「%1」，但回覆會寄到「%2」，這是不同的網域。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1613"/>
+        <location filename="../EMAilHelper.cpp" line="1830"/>
         <source>Malformed signed section</source>
-        <translation type="unfinished"></translation>
+        <translation>格式錯誤的簽署區段</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1614"/>
+        <location filename="../EMAilHelper.cpp" line="1831"/>
         <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>
+        <translation>簽署區段必須恰好包含兩個部分；此區段包含 %1 個。它可能無法驗證，且其涵蓋的內容不明確。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1622"/>
+        <location filename="../EMAilHelper.cpp" line="1839"/>
         <source>Malformed encrypted section</source>
-        <translation type="unfinished"></translation>
+        <translation>格式錯誤的加密區段</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1623"/>
+        <location filename="../EMAilHelper.cpp" line="1840"/>
         <source>An encrypted section must contain exactly two parts; this one contains %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>加密區段必須恰好包含兩個部分；此區段包含 %1 個。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1639"/>
+        <location filename="../EMAilHelper.cpp" line="1856"/>
         <source>Not everything is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>並非所有內容均已簽署</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1640"/>
+        <location filename="../EMAilHelper.cpp" line="1857"/>
         <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>
+        <translation>此訊息的 %1 個部分位於簽章之外。它們未經驗證送達，路徑上的任何人都可能新增或變更。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1654"/>
+        <location filename="../EMAilHelper.cpp" line="1871"/>
         <source>Signature covers the encrypted data only</source>
-        <translation type="unfinished"></translation>
+        <translation>簽章僅涵蓋加密資料</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1655"/>
+        <location filename="../EMAilHelper.cpp" line="1872"/>
         <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>
+        <translation>此簽章是對加密區塊簽署，而非對其中的訊息簽署。它顯示誰傳送了密文；它並未說明你所閱讀內容的撰寫者是誰，且任何人都可能簽署同一個區塊的副本。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1686"/>
+        <location filename="../EMAilHelper.cpp" line="1903"/>
         <source>Public key attached</source>
-        <translation type="unfinished"></translation>
+        <translation>已附加公鑰</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1687"/>
+        <location filename="../EMAilHelper.cpp" line="1904"/>
         <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>
+        <translation>此訊息帶有 %1 個 OpenPGP 公鑰。訊息中附帶的金鑰無法證明寄件者身分：任何人都能附加任何金鑰，包括他們為寄件者欄位上的名稱所製作的金鑰。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1696"/>
+        <location filename="../EMAilHelper.cpp" line="1913"/>
         <source>Detached signature attached</source>
-        <translation type="unfinished"></translation>
+        <translation>已附加分離式簽章</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1697"/>
+        <location filename="../EMAilHelper.cpp" line="1914"/>
         <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>
+        <translation>此訊息帶有 %1 個簽章檔，這些檔案不屬於其自身簽章結構的一部分。開啟訊息不會檢查它們；它們簽署的是其他內容。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1707"/>
+        <location filename="../EMAilHelper.cpp" line="1924"/>
         <source>Blind recipients are visible</source>
-        <translation type="unfinished"></translation>
+        <translation>密件副本收件者可見</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1708"/>
+        <location filename="../EMAilHelper.cpp" line="1925"/>
         <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>
+        <translation>此訊息帶有包含 %1 位收件者的 Bcc 標頭。任何收到此訊息的人都能看到誰被列入密件副本。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1724"/>
+        <location filename="../EMAilHelper.cpp" line="1941"/>
         <source>Nothing is signed</source>
-        <translation type="unfinished"></translation>
+        <translation>未簽署任何內容</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1725"/>
+        <location filename="../EMAilHelper.cpp" line="1942"/>
         <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>
+        <translation>此訊息沒有攜帶任何簽章，因此收件者無法確認它是否來自您，也無法確認它送達時是否未經更改。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1741"/>
+        <location filename="../EMAilHelper.cpp" line="1958"/>
         <source>Some parts are not signed</source>
-        <translation type="unfinished"></translation>
+        <translation>有些部分未簽署</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1742"/>
+        <location filename="../EMAilHelper.cpp" line="1959"/>
         <source>%1 part(s) of this message would go out without the signature covering them.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息的 %1 個部分將在簽章未涵蓋的情況下寄出。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1751"/>
+        <location filename="../EMAilHelper.cpp" line="1968"/>
         <source>Blind recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>密件收件者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1752"/>
+        <location filename="../EMAilHelper.cpp" line="1969"/>
         <source>%1 blind recipient(s) will be included in encryption but will not appear anywhere in the message.</source>
-        <translation type="unfinished"></translation>
+        <translation>加密將包含 %1 位密件收件者，但不會出現在訊息中的任何位置。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1759"/>
+        <location filename="../EMAilHelper.cpp" line="1976"/>
         <source>Bcc header present</source>
-        <translation type="unfinished"></translation>
+        <translation>含有 Bcc 標頭</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1760"/>
+        <location filename="../EMAilHelper.cpp" line="1977"/>
         <source>This message carries a Bcc header. Sending it would tell every recipient who was blind-copied.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息帶有 Bcc 標頭。寄出後會讓所有收件者知道密件副本收件者。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1768"/>
+        <location filename="../EMAilHelper.cpp" line="1985"/>
         <source>Recipient may be disguised</source>
-        <translation type="unfinished"></translation>
+        <translation>收件者可能遭到偽裝</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1769"/>
+        <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>
-        <translation type="unfinished"></translation>
+        <translation>「%1」中的網域使用了可被繪製成看似不同地址的字元。寄出前請檢查。</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1776"/>
+        <location filename="../EMAilHelper.cpp" line="1993"/>
         <source>No recipients</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有收件者</translation>
     </message>
     <message>
-        <location filename="../EMAilHelper.cpp" line="1777"/>
+        <location filename="../EMAilHelper.cpp" line="1994"/>
         <source>This message is not addressed to anyone.</source>
-        <translation type="unfinished"></translation>
+        <translation>此訊息沒有指定任何收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="195"/>
+        <location filename="../EMailTlsSetup.cpp" line="197"/>
         <source>Issued by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>簽發者：%1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="197"/>
+        <location filename="../EMailTlsSetup.cpp" line="198"/>
         <source>Valid for: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>有效於：%1</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="198"/>
+        <location filename="../EMailTlsSetup.cpp" line="199"/>
         <source>NOT valid for %1: it names a different host</source>
-        <translation type="unfinished"></translation>
+        <translation>對 %1 無效：它指定了不同的主機</translation>
     </message>
     <message>
-        <location filename="../EMailTlsSetup.cpp" line="200"/>
+        <location filename="../EMailTlsSetup.cpp" line="202"/>
         <source>Valid from %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>自 %1 至 %2 有效</translation>
     </message>
 </context>
 </TS>