feat(email): update attachment UI translations

- add translations for attachment management and message actions - add summary and expand/collapse attachment strings - refresh source locations after email view changes - mark obsolete draft and attachment messages as vanished - update German, Spanish, French, Italian, Polish, Russian, and Chinese locales
author: saturneric <[email protected]> 2026-09-29 19:52:17 +0200
committer: saturneric <[email protected]> 2026-09-29 19:52:17 +0200
commit: 0cddf993b303216d452cc9c9a9ebdb452b59f86e (patch)
tree: b740cfa630a60feed97527576ffb244c076d8b49
parent: feat(email): redesign action and attachment bars (diff)
download: modules-0cddf993b303216d452cc9c9a9ebdb452b59f86e.tar.gz
modules-0cddf993b303216d452cc9c9a9ebdb452b59f86e.zip
9 files changed, 2197 insertions, 1713 deletions
diff --git a/src/m_email/ts/ModuleEMail.de_DE.ts b/src/m_email/ts/ModuleEMail.de_DE.ts
index 1349c18..67d2028 100644
--- a/src/m_email/ts/ModuleEMail.de_DE.ts
+++ b/src/m_email/ts/ModuleEMail.de_DE.ts
@@ -1200,401 +1200,409 @@ Wenn das Problem weiterhin besteht, wenden Sie sich an den technischen Support o
         <translation type="vanished">Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Bcc</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>An:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Senden...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Senden Sie diese Nachricht über ein konfiguriertes E-Mail-Konto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Schreiben Sie hier Ihre Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Fügen Sie dieser Nachricht eine oder mehrere Dateien hinzu. Dateien können auch auf die Nachricht gezogen werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Entfernen Sie die ausgewählten Anhänge aus dieser Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Ausgewählte Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Alle Anhänge in einen Ordner speichern.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Diese Nachricht ist verschlüsselt. Entschlüsseln Sie sie vor dem Bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Diese Nachricht ist verschlüsselt und signiert. Entschlüsseln Sie sie und entfernen Sie dann die Signatur, bevor Sie die Nachricht bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Rohquelle</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Trennen Sie mehrere Adressen mit &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Anhänge</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Weitere Anhangsaktionen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Geschützte Nachricht</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Diese Bytes sind durch eine Signatur abgedeckt oder sind Chiffrat. Entfernen Sie die Signatur oder entschlüsseln Sie die Nachricht, bevor Sie die Quelle bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Bearbeitung beenden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Rohquelle bearbeiten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Sie bearbeiten die Rohquelle der Nachricht. Was Sie hier eingeben, ist das Dokument.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Diese Nachricht ist zur Überprüfung gesperrt. Ihre Quelle kann nicht bearbeitet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Schreibgeschützt. Entsperren Sie, um die Nachrichtenquelle direkt zu bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>Unbenannt.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Diese Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Diese Nachricht ist verschlüsselt und signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Die Empfänger werden in den Kopfzeilen nicht genannt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Adressiert an %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>Sie besitzen den privaten Schlüssel für %1, daher kann diese Nachricht hier geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>Sie besitzen private Schlüssel für %1, daher kann diese Nachricht hier geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Diese Nachricht ist an Schlüssel verschlüsselt, deren privaten Teil Sie nicht besitzen, daher kann sie auf diesem Computer nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Einige Empfänger dieser Nachricht wurden absichtlich nicht genannt, daher lässt sich nicht feststellen, ob Sie die Nachricht öffnen können, bis Sie es versuchen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>Die Empfänger dieser Nachricht können nicht gelesen werden, daher lässt sich nicht feststellen, ob Sie die Nachricht öffnen können, bis Sie es versuchen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>Die Empfänger sind nicht benannt, sodass sich nicht feststellen lässt, ob Sie diese Nachricht öffnen können, bis Sie es versuchen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>öffentlichen Schlüssel anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>Text zu dieser Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Nachricht gesperrt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Diese Nachricht ist nur zur Ansicht geöffnet, daher ist es nicht möglich, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Nachricht ist verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Entschlüsseln Sie diese Nachricht, bevor Sie versuchen, %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Nachricht ist signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>Dies ist ein Entwurf, den Sie noch schreiben, keine empfangene Nachricht, daher gibt es hier noch nichts zu tun.</translation>
+        <translation type="vanished">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="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Diese Nachricht kann ohnehin nicht bearbeitet werden: Sie ist signiert oder verschlüsselt und daher bereits vor dem Umschreiben geschützt.</translation>
+        <translation type="vanished">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="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Es ist noch kein E-Mail-Konto eingerichtet. Fügen Sie unter Einstellungen bei den E-Mail-Konten eines hinzu, dann kann diese Nachricht gesendet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Geben Sie an, von wem diese Nachricht stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Die Absenderadresse sieht nicht wie eine E-Mail-Adresse aus.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Fügen Sie mindestens einen Empfänger hinzu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Geben Sie dieser Nachricht einen Betreff.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Dies sieht nicht wie eine E-Mail-Adresse aus: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>Signatur konnte nicht überprüft werden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Fehlerhafte OpenPGP-Struktur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>Weder signiert noch verschlüsselt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Diese Nachricht ist zur Ansicht gesperrt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Verschlüsseln...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Verschlüsseln und Signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Signatur verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Signaturdetails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Erneut mit einem anderen Schlüssel signieren...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Signatur entfernen...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Entschlüsseln und Verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Verschlüsselungsdetails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Details...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Entschlüsseln Sie zuerst diese Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Was ist mit dieser Nachricht nicht in Ordnung?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Trotzdem verifizieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Trotzdem entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Signatur nicht erreichbar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Die Signatur befindet sich im verschlüsselten Teil dieser Nachricht. Entschlüsseln Sie zuerst die Nachricht.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Nichts zu entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Diese Nachricht enthält keine Signatur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>Signatur kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Diese Nachricht folgt RFC 3156 nicht genau genug, um ihre Signatur sicher zu entfernen. Bearbeiten Sie stattdessen den Rohquelltext.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Signatur entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Die Signatur wird verworfen und die Nachricht wird eine normale unsignierte Nachricht. Die Nachricht selbst bleibt unverändert. Dies kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>unsigniert</translation>
     </message>
@@ -1617,42 +1625,42 @@ Die Signatur wird verworfen und die Nachricht wird eine normale unsignierte Nach
         <translation type="vanished">Senden nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Diese Nachricht benötigt einen Absender und mindestens einen Empfänger, bevor sie gesendet werden kann.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Struktur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Nachrichtendetails</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>Kopfzeilen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Blindkopie-Empfänger werden niemals in die Nachricht geschrieben: Eine Bcc-Kopfzeile würde jedem Empfänger zeigen, wer eine Blindkopie erhalten hat. Sie werden zur Auswahl der Verschlüsselungsempfänger verwendet und nicht zusammen mit der Datei gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Kopie und Blindkopie anzeigen (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Nachricht anzeigen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Rohes Dokument anzeigen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Eine Antwort an den Absender schreiben.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Allen antworten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Eine Antwort an den Absender und alle anderen Empfänger schreiben. Blindkopie-Empfänger sind nicht enthalten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Weiterleiten</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Diese Nachricht mit ihren Anhängen weiterleiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Schreibgeschützt</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Diese Nachricht sperren, damit sie nicht bearbeitet oder neu geschrieben werden kann. Antworten und Weiterleiten funktionieren weiterhin und erzeugen neue Nachrichten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Zeigen, was über diese Nachricht bekannt ist: ihre Signaturen, ihre Struktur und ihre Kopfzeilen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Signiert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Datei anhängen...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Speichern...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Alle speichern...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Diese Nachricht ist nur zur Ansicht geöffnet. Sie kann nicht bearbeitet oder neu geschrieben werden; Antworten und Weiterleiten funktionieren weiterhin und erzeugen neue Nachrichten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Diese Nachricht ist signiert. Entfernen Sie die Signatur, bevor Sie sie bearbeiten. Eine Bearbeitung unter einer Signatur gilt als Fälschung.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Diese Nachricht wurde in HTML verfasst. Sie wird als Quelltext statt gerendert angezeigt: Es werden keine Bilder geladen und keine Links verfolgt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Schreibgeschützt. Diese Bytes sind geschützt. Entfernen Sie die Signatur oder entschlüsseln Sie die Nachricht, um sie zu bearbeiten.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Diese Nachricht konnte nicht zur Ansicht zusammengestellt werden, daher gibt es hier nichts anzuzeigen. Die Nachricht selbst ist unverändert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>Antworten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>Antwort an alle nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>Weiterleiten nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">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="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Die neue Nachricht konnte nicht zusammengestellt werden. Dies bedeutet in der Regel, dass ein Teil der Originalnachricht nicht neu kodiert werden konnte, meistens ein Anhang.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Eine Registerkarte für die neue Nachricht konnte nicht geöffnet werden.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">Die Empfänger sind nicht benannt, daher kann erst beim Versuch festgestellt werden, ob Sie diese Nachricht öffnen können.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Sie besitzen keinen privaten Schlüssel für eine dieser Adressen. Sofern die Nachricht nicht zusätzlich mit einem Schlüssel verschlüsselt wurde, der hier nicht genannt ist, kann sie auf diesem Computer nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>Sie besitzen den privaten Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>Sie besitzen private Schlüssel für %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Verschlüsselt, Signatur nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Signatur nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Verschlüsselt, Signatur verifiziert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Signatur verifiziert</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Signiert von einer anderen Adresse</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Signatur oder Schlüssel abgelaufen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Signiert von einem unbekannten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Ungültige Signatur</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>signiert, nicht geprüft</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>signiert, konnte nicht überprüft werden</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>Signatur nicht gut</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Einige Teile befinden sich außerhalb des signierten Abschnitts dieser Nachricht. Sie sind nicht von der Signatur abgedeckt und könnten von jedem hinzugefügt worden sein.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 Anhang</translation>
+        <translation type="vanished">1 Anhang</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 Anhänge</translation>
+        <translation type="vanished">%1 Anhänge</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>E-Mail-Nachricht (*.eml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>Senden nicht möglich</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Dateien anhängen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 ist ein Ordner</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 ist keine normale Datei</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Signatur entfernen und die Nachricht in eine gewöhnliche Nachricht umwandeln?</
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Anhänge öffnen, speichern und verwalten</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Mehr</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Weitere Aktionen für diese Nachricht</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Diese Nachricht ist nur zur Prüfung geöffnet. Unter „Mehr“ wieder ausschalten.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 Dateien · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Einklappen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Aufklappen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Nur die Zusammenfassung anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Alle Anhänge anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Schlüssel importieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Namen kopieren</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Anhang öffnen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Speichern Sie sie stattdessen und öffnen Sie sie selbst, wenn Sie sicher sind, woher sie stammt.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Ein temporärer Ordner zum Öffnen von %1 konnte nicht erstellt werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>%1 konnte nicht zum Öffnen geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Auf diesem System ist nichts registriert, um %1 zu öffnen.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Anhang entfernen</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurden, ist dies die einzige Kopie. Das Entfernen kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ Diese Nachricht stammt von anderswo. Sofern diese nicht bereits gespeichert wurd
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>1 Datei gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>%1 Dateien gespeichert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Anhang speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>%1 kann nicht geschrieben werden.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Anhänge speichern</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>Konnte nicht schreiben: %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.en_US.ts b/src/m_email/ts/ModuleEMail.en_US.ts
index f1788b6..3b690b9 100644
--- a/src/m_email/ts/ModuleEMail.en_US.ts
+++ b/src/m_email/ts/ModuleEMail.en_US.ts
@@ -1010,814 +1010,850 @@ If the issue persists, consider seeking technical support or consulting the docu
 <context>
     <name>EMailPageView</name>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <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="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
-        <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="2164"/>
-        <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="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <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="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <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="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <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="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <source>%1.
 
 Blind recipients are never written into the message: a Bcc header would tell every recipient who was blind-copied. They are used to choose encryption recipients and are not saved with the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <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="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <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="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <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="2851"/>
-        <source>1 attachment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
-        <source>%1 attachments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -1826,47 +1862,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="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <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="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</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 d28a33c..4e61a34 100644
--- a/src/m_email/ts/ModuleEMail.es_ES.ts
+++ b/src/m_email/ts/ModuleEMail.es_ES.ts
@@ -1200,401 +1200,409 @@ Si el problema persiste, considere buscar soporte técnico o consultar la docume
         <translation type="vanished">separe varias direcciones con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Cco</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>Para:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>Cco:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Enviar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Enviar este mensaje a través de una cuenta de correo configurada.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Escriba su mensaje aquí.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Añada uno o más archivos a este mensaje. Los archivos también se pueden soltar en el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Quitar los archivos adjuntos seleccionados de este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Guardar los adjuntos seleccionados en una carpeta.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Guardar cada adjunto en una carpeta.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Este mensaje está cifrado. Descífrelo antes de editarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Este mensaje está cifrado y firmado. Descífrelo y, a continuación, elimine la firma antes de editar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Fuente sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Separe varias direcciones con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Adjuntos</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Más acciones de adjuntos</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Mensaje protegido</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Estos bytes están cubiertos por una firma, o son texto cifrado. Elimine la firma o descifre el mensaje, antes de editar su fuente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Dejar de editar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Editar fuente sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Está editando la fuente sin procesar del mensaje. Lo que escribe aquí es el documeto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Este mensaje está bloquedo para inspección. Su fuete no se puede editar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Solo lectura. Desbloquee para editar la fuete del mensaje directmente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>sin título.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Este mensaje está cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Descifrar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Este mensaje está cifrado y firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Los destinatarios no se mencionan en las cabeceras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Dirigido a %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>Posee la clave privada de %1, por lo que este mensaje se puede abrir aquí.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>Posee claves privadas para %1, por lo que este mensaje se puede abrir aquí.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Este mensaje está cifrado para claves cuya parte privada no posee, por lo que no se puede abrir en este equipo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Algunos destinatarios de este mensaje no se mencionaron deliberadamente, por lo que no hay forma de saber si puede abrirlo hasta que lo intente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>Los destinatarios de este mensaje no se pueden leer, por lo que no hay forma de saber si puede abrirlo hasta que lo intente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>Los destinatarios no se mencionan, por lo que no hay manera de saber si puede abrir esto hasta que lo intente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>adjuntar una clave pública</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>añadir texto a este mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Mensaje bloqueado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Este mensaje está abierto solo para inspección, por lo que no es posible %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Mensaje cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Descifre este mensaje antes de intentar %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Mensaje firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>Este es un borrador que aún estás escribiendo, no un mensaje recibido, así que no hay nada sobre lo que actuar todavía.</translation>
+        <translation type="vanished">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="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Este mensaje no se puede editar de todos modos: está firmado o cifrado, por lo que ya está protegido contra reescrituras.</translation>
+        <translation type="vanished">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="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Aún no hay ninguna cuenta de correo configurada. Añade una en Configuración, en Cuentas de correo, y este mensaje podrá enviarse.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Indica quién envía este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>La dirección del remitente no parece una dirección de correo electrónico.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Añade al menos un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Pon un asunto a este mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Esto no parece una dirección de correo electrónico: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>No se pudo comprobar la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Estructura OpenPGP malformada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>No firmado ni cifrado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Este mensaje está bloqueado para inspección.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Cifrar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Cifrar y firmar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Verificar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Detalles de la firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Volver a firmar con otra clave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Eliminar firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Descifrar y verificar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Detalles del cifrado...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Detalles...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Descifre este mensaje primero.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>¿Qué le pasa a este mensaje?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Intentar verificar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Intentar descifrar de todos modos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Firma inaccesible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La firma está dentro de la parte cifrada de este mensaje. Descifre primero el mensaje.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Nada que quitar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Este mensaje no lleva ninguna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>No se puede quitar la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Este mensaje no sigue el RFC 3156 lo bastante fielmente como para quitarle la firma de forma segura. Edite la fuente original en su lugar.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Quitar firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La firma se descarta y el mensaje se convierte en uno normal sin firmar. El mensaje en sí se conserva exactamente como está. Esta acción no se puede deshacer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>sin firmar</translation>
     </message>
@@ -1617,42 +1625,42 @@ La firma se descarta y el mensaje se convierte en uno normal sin firmar. El mens
         <translation type="vanished">No se puede enviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Este mensaje necesita un remitente y al menos un destinatario antes de poder enviarse.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Estructura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Detalles del mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>Cabeceras</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Los destinatarios ocultos nunca se escriben en el mensaje: una cabecera Cco revelaría a todos los destinatarios quién recibió una copia oculta. Se utilizan para elegir los destinatarios del cifrado y no se guardan con el archivo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Mostrar Cc y Cco (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Mostrar el mensaje</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Mostrar el documento sin procesar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Redactar una respuesta al remitente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Responder a todos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Redactar una respuesta al remitente y a todos los demás destinatarios. No se incluye a los destinatarios ocultos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Reenviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Reenviar este mensaje con sus adjuntos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Solo lectura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Bloquear este mensaje para que no se pueda editar ni reescribir. Responder y Reenviar siguen funcionando y generan mensajes nuevos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Mostrar lo que se sabe sobre este mensaje: sus firmas, su estructura y sus cabeceras.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Firmado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Adjuntar archivo...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Guardar...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Guardar todo...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Este mensaje está abierto solo para inspección. No se puede editar ni reescribir; Responder y Reenviar siguen funcionando y generan mensajes nuevos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Este mensaje está firmado. Elimine la firma antes de editarlo. Una edición bajo una firma se considera una falsificación.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Este mensaje fue escrito en HTML. Se muestra como su código fuente en lugar de renderizado: nada aquí carga imágenes ni sigue enlaces.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Solo lectura. Estos bytes están protegidos. Elimine la firma o descifre el mensaje para editarlos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Este mensaje no se pudo ensamblar para su inspección, por lo que no hay nada que mostrar aquí. El mensaje en sí no ha cambiado.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>No se puede responder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>No se puede responder a todos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>No se puede reenviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">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="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>No se pudo ensamblar el mensaje nuevo. Esto normalemente signiffica que una parte del original no se pudo volver a codifcar, casi siempre un adjunto.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>No se pudo abrir una pestaña para el mensaje nuevo.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">Los destinatarios no se indican, por lo que no se puede saber si puede abrirlo hasta que lo intente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>No tiene una clave privada para ninguna de estas direcciones. A menos que el mensaje también se haya cifrado para una clave que no se menciona aquí, no se puede abrir en este equipo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>Tiene la clave privada de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>Tiene claves privadas para %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 ¿Quitar la firma y convertirlo en un mensaje normal?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Cifrado, firma no comprobada.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Firma no comprobada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Cifrado, firma verificada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Firma verificada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Firmado por una dirección diferente</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Firma o clave expirada</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Firmado por una clave desconocida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Firma incorrecta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>firmado, no comprobado</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>firmado, no se pudo comprobar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>firma no válida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Algunas partes están fuera de la sección firmada de este mensaje. No están cubiertas por la firma y cualquiera podría haberlas añadido.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 adjunto</translation>
+        <translation type="vanished">1 adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 adjuntos</translation>
+        <translation type="vanished">%1 adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Mensaje de correo electrónico (*.eml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>No se puede enviar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Adjuntar archivos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 es una carpeta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 no es un archivo normal</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Abrir, guardar y gestionar adjuntos</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Más</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Más acciones para este mensaje</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Este mensaje está abierto solo para inspección. Desactívalo en Más.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 archivos · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Contraer</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Expandir</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Mostrar solo el resumen</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Mostrar todos los adjuntos</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Importar clave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Copiar nombre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Abrir archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Guárdelo en su lugar y ábralo usted mismo si está seguro de su procedencia.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>No se pudo crear una carpeta temporal desde la que abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>No se pudo escribir %1 para abrirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nada en este sistema está registrado para abrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Quitar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la única copia. Quitarlos no se puede deshacer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ Este mensaje viene de otro lugar; a menos que ya se hayan guardado, esta es la �
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>Se guardó 1 archivo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>Se guardaron %1 archivos.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Guardar archivo adjunto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>No se puede escribir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Guardar adjuntos</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>No se pudo escribir: %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.fr_FR.ts b/src/m_email/ts/ModuleEMail.fr_FR.ts
index a7fbdbf..6d8b779 100644
--- a/src/m_email/ts/ModuleEMail.fr_FR.ts
+++ b/src/m_email/ts/ModuleEMail.fr_FR.ts
@@ -1200,401 +1200,409 @@ Si le problème persiste, envisagez de contacter le support technique ou de cons
         <translation type="vanished">séparez plusieurs adresses par &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Cci</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>À :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>Cc :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>Cci :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Objet :</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Envoyer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Envoyer ce message via un compte de messagerie configuré.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Écrivez votre message ici.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Ajoutez un ou plusieurs fichiers à ce message. Vous pouvez également déposer des fichiers sur le message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Retirez les pièces jointes sélectionnées de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Enregistrer les pièces jointes sélectionnées dans un dossier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Enregistrer toutes les pièces jointes dans un dossier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Ce message est chiffré. Déchiffrez-le avant de le modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Ce message est chiffré et signé. Déchiffrez-le, puis supprimez la signature, avant de le modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Source brute</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Séparez plusieurs adresses par &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Pièces jointes</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Autres actions sur les pièces jointes</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Message protégé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Ces octets sont couverts par une signature, ou sont du texte chiffré. Supprimez la signature, ou déchiffrez le message, avant de modifier sa source.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Arrêter la modification</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Modifier la source brute</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Vous modifiez la source brute du message. Ce que vous tapez ici est le document.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Ce message est verrouillé pour inspection. Sa source ne peut pas être modifiée.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Lecture seule. Déverrouillez pour modifier directement la source du message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>Sans titre.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Ce message est chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Déchiffrer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Ce message est chiffré et signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Les destinataires ne sont pas nommés dans les en-têtes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Adressé à %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>Vous détenez la clé privée pour %1, ce message peut donc être ouvert ici.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>Vous détenez des clés privées pour %1, ce message peut donc être ouvert ici.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Ce message est chiffré pour des clés dont vous ne détenez pas la partie privée, il ne peut donc pas être ouvert sur cet ordinateur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Certains destinataires de ce message sont volontairement anonymes, il est donc impossible de savoir si vous pouvez l&apos;ouvrir avant d&apos;essayer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>Les destinataires de ce message ne peuvent pas être lus, il est donc impossible de savoir si vous pouvez l&apos;ouvrir avant d&apos;essayer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>Les destinataires ne sont pas nommés, il est donc impossible de savoir si vous pouvez l&apos;ouvrir avant d&apos;essayer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>joindre une clé publique</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>ajouter du texte à ce message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Message verrouillé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Ce message est ouvert en lecture seule ; il n&apos;est donc pas possible de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Message chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Déchiffrez ce message avant d’essayer de %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Message signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>Ceci est un brouillon que vous rédigez encore, pas un message reçu, donc il n&apos;y a rien à traiter pour l&apos;instant.</translation>
+        <translation type="vanished">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="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Ce message ne peut de toute façon pas être modifié : il est signé ou chiffré, il est donc déjà protégé contre toute réécriture.</translation>
+        <translation type="vanished">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="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Aucun compte de messagerie n&apos;est configuré pour le moment. Ajoutez-en un dans Paramètres, sous Comptes de messagerie, et ce message pourra être envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Indiquez qui est l&apos;expéditeur de ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>L&apos;adresse « De » ne ressemble pas à une adresse e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Ajoutez au moins un destinataire.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Donnez un objet à ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Ceci ne ressemble pas à une adresse e-mail : %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>La signature n&apos;a pas pu être vérifiée.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Structure OpenPGP malformée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>Ni signé ni chiffré</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Ce message est verrouillé pour inspection.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Chiffrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Chiffrer et signer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Vérifier la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Détails de la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Signer à nouveau avec une autre clé...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Supprimer la signature...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Déchiffrer et vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Détails du chiffrement...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Détails...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Déchiffrez d&apos;abord ce message.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Qu&apos;est-ce qui ne va pas avec ce message ?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Essayer de vérifier quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Essayer de déchiffrer quand même</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Signature inaccessible</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La signature se trouve dans la partie chiffrée de ce message. Déchiffrez-le d&apos;abord.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Rien à supprimer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Ce message ne comporte aucune signature.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>Impossible de supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Ce message ne respecte pas assez la RFC 3156 pour que sa signature puisse être retirée en toute sécurité. Modifiez plutôt la source brute.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Supprimer la signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La signature est abandonnée et le message devient un message ordinaire non signé. Le message lui-même est conservé tel quel. Cette action est irréversible.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>non signé</translation>
     </message>
@@ -1617,42 +1625,42 @@ La signature est abandonnée et le message devient un message ordinaire non sign
         <translation type="vanished">Impossible d&apos;envoyer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Ce message nécessite un expéditeur et au moins un destinataire avant de pouvoir être envoyé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Structure</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Détails du message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>En-têtes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Les destinataires en Cci ne sont jamais écrits dans le message : un en-tête Cci révélerait à chaque destinataire l&apos;identité des destinataires en Cci. Ils servent à sélectionner les destinataires du chiffrement et ne sont pas enregistrés avec le fichier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Afficher les champs Cc et Cci (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Afficher le message</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Afficher le document brut</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Rédiger une réponse à l&apos;expéditeur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Répondre à tous</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Rédiger une réponse à l&apos;expéditeur et à tous les autres destinataires. Les destinataires en copie cachée ne sont pas inclus.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Transférer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Transmettre ce message avec ses pièces jointes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Lecture seule</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Verrouiller ce message afin qu&apos;il ne puisse pas être modifié ou réécrit. Répondre et Transférer fonctionnent toujours et produisent de nouveaux messages.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Afficher ce que l&apos;on sait de ce message : ses signatures, sa structure et ses en-têtes.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Signé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Joindre un fichier...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Enregistrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Tout enregistrer...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Ce message est ouvert pour simple inspection. Il ne peut être ni modifié ni réécrit ; Répondre et Transférer restent disponibles et produisent de nouveaux messages.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Ce message est signé. Supprimez la signature avant de le modifier. Une modification sous une signature est perçue comme une falsification.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Ce message a été écrit en HTML. Il est affiché sous forme de source plutôt que rendu : rien ici ne charge d’images ni ne suit de liens.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Lecture seule. Ces octets sont protégés. Supprimez la signature ou déchiffrez le message pour les modifier.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Ce message n’a pas pu être assemblé pour inspection, il n’y a donc rien à afficher ici. Le message lui-même est inchangé.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>Impossible de répondre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>Impossible de répondre à tous</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>Impossible de faire suivre</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">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="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Le nouveau message n&apos;a pas pu être assemblé. Cela signifie généralement qu&apos;une partie du message original n&apos;a pas pu être réencodée, le plus souvent une pièce jointe.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Impossible d&apos;ouvrir un onglet pour le nouveau message.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">Les destinataires ne sont pas nommés, on ne peut donc savoir si vous pouvez ouvrir ce message qu&apos;en essayant.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Vous ne détenez aucune clé privée pour ces adresses. À moins que le message n&apos;ait également été chiffré à destination d&apos;une clé qui n&apos;est pas nommée ici, il ne peut pas être ouvert sur cet ordinateur.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>Vous détenez la clé privée pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>Vous détenez des clés privées pour %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 Supprimer la signature et en faire un message ordinaire ?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Chiffré, signature non vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Signature non vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Chiffré, signature vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Signature vérifiée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Signé par une adresse différente</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Signature ou clé expirée</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Signé par une clé inconnue</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Mauvaise signature</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>signé, non vérifié</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>signé, impossible à vérifier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>signature non valide</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Certaines parties sont en dehors de la section signée de ce message. Elles ne sont pas couvertes par la signature et auraient pu être ajoutées par n&apos;importe qui.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 pièce jointe</translation>
+        <translation type="vanished">1 pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 pièces jointes</translation>
+        <translation type="vanished">%1 pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Message e-mail (*.eml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>Impossible d&apos;envoyer</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Joindre des fichiers</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 est un dossier</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <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="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1 : %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Supprimer la signature et en faire un message ordinaire ?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Supprimer la signature et en faire un message ordinaire ?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Ouvrir, enregistrer et gérer les pièces jointes</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Plus</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Autres actions pour ce message</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Ce message est ouvert en inspection seule. Désactivez-le dans Plus.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 fichiers · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Replier</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Déplier</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Afficher seulement le résumé</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Afficher toutes les pièces jointes</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Importer une clé</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Copier le nom</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Ouvrir la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Enregistrez-le plutôt et ouvrez-le vous-même si vous êtes sûr de sa provenance.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Impossible de créer un dossier temporaire pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>%1 n&apos;a pas pu être écrit pour être ouvert.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Aucun programme de ce système n&apos;est enregistré pour ouvrir %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Retirer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà été enregistrés, il s&apos;agit de la seule copie. Leur retrait est irréversible.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ Ce message provient d&apos;ailleurs ; à moins que ces fichiers aient déjà ét
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>1 fichier enregistré.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>%1 fichiers enregistrés.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Enregistrer la pièce jointe</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>Impossible d&apos;écrire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Enregistrer les pièces jointes</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>Impossible d&apos;écrire : %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.it_IT.ts b/src/m_email/ts/ModuleEMail.it_IT.ts
index d3b1f9f..78d7f32 100644
--- a/src/m_email/ts/ModuleEMail.it_IT.ts
+++ b/src/m_email/ts/ModuleEMail.it_IT.ts
@@ -1200,401 +1200,409 @@ Se il problema persiste, si consiglia di contattare il supporto tecnico o consul
         <translation type="vanished">separare più indirizzi con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>Cc/Ccn</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>Ccn:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Oggetto:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Invia...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Invia questo messaggio tramite un account di posta configurato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Scrivi qui il tuo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Aggiungi uno o più file a questo messaggio. I file possono anche essere trascinati sul messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Rimuovi gli allegati selezionati da questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Salva gli allegati selezionati in una cartella.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Salva tutti gli allegati in una cartella.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Questo messaggio è cifrato. Decifralo prima di modificarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Questo messaggio è cifrato e firmato. Decifralo, quindi rimuovi la firma, prima di modificarlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Sorgente grezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Separa più indirizzi con &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Allegati</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Altre azioni sugli allegati</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Messaggio protetto</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Questi byte sono coperti da una firma, oppure sono testo cifrato. Rimuovi la firma o decifra il messaggio prima di modificarne la sorgente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Interrompi modifica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Modifica sorgente grezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Stai modificando la sorgente grezza del messaggio. Quello che digiti qui è il documento.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Questo messaggio è bloccato per ispezione. La sua sorgente non può essere modificata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Sola lettura. Sblocca per modificare direttamente la sorgente del messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>senza_titolo.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Questo messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Decifra</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Questo messaggio è cifrato e firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>I destinatari non sono indicati nelle intestazioni.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Destinatario: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>Possiedi la chiave privata per %1, quindi questo messaggio può essere aperto qui.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>Possiedi le chiavi private per %1, quindi questo messaggio può essere aperto qui.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Questo messaggio è cifrato per chiavi di cui non possiedi le corrispondenti chiavi private, quindi non può essere aperto su questo computer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Alcuni destinatari di questo messaggio non sono stati indicati deliberatamente, quindi non c&apos;è modo di sapere se puoi aprirlo finché non provi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>I destinatari di questo messaggio non possono essere letti, quindi non c&apos;è modo di sapere se puoi aprirlo finché non provi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>I destinatari non sono indicati, quindi non è possibile sapere se puoi aprirlo finché non provi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>Allega una chiave pubblica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>Aggiungi testo a questo messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Messaggio bloccato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Questo messaggio è aperto solo per ispezione, quindi non è possibile %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Il messaggio è cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Decifra questo messaggio prima di provare a %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Il messaggio è firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>Questa è una bozza che stai ancora scrivendo, non un messaggio ricevuto, quindi non c&apos;è ancora nulla su cui agire.</translation>
+        <translation type="vanished">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="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Questo messaggio non può comunque essere modificato: è firmato o cifrato, quindi è già protetto dalla riscrittura.</translation>
+        <translation type="vanished">Questo messaggio non può comunque essere modificato: è firmato o cifrato, quindi è già protetto dalla riscrittura.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Nessun account di posta è ancora configurato. Aggiungine uno in Impostazioni, sotto Account di posta, e questo messaggio potrà essere inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Indica il mittente di questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>L&apos;indirizzo del mittente non sembra un indirizzo e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Aggiungi almeno un destinatario.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Assegna un oggetto a questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Questo non sembra un indirizzo e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>Impossibile verificare la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Struttura OpenPGP malformata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>Né firmato né cifrato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Questo messaggio è bloccato per ispezione.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Cifra...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Cifra e firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Verifica firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Dettagli firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Rifirma con un&apos;altra chiave...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Rimuovi firma...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Decifra e verifica</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Dettagli di cifratura...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Dettagli...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Decifra prima questo messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Cosa c&apos;è che non va in questo messaggio?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Prova comunque a verificare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Prova comunque a decifrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Firma non raggiungibile</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>La firma si trova nella parte cifrata di questo messaggio. Decifra prima il messaggio.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Nulla da rimuovere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Questo messaggio non contiene alcuna firma.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>Impossibile rimuovere la firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Questo messaggio non segue abbastanza fedelmente la RFC 3156 per poterne rimuovere la firma in sicurezza. Modifica invece il sorgente grezzo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Rimuovi firma</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 La firma viene eliminata e il messaggio diventa un normale messaggio non firmato. Il messaggio stesso viene mantenuto esattamente com&apos;è. Questa operazione non può essere annullata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>non firmato</translation>
     </message>
@@ -1617,42 +1625,42 @@ La firma viene eliminata e il messaggio diventa un normale messaggio non firmato
         <translation type="vanished">Impossibile inviare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Questo messaggio richiede un mittente e almeno un destinatario prima di poter essere inviato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Struttura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Dettagli del messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>Intestazioni</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 I destinatari in copia nascosta non vengono mai scritti nel messaggio: un&apos;intestazione Ccn rivelerebbe a ogni destinatario chi era in copia nascosta. Vengono usati per scegliere i destinatari della cifratura e non vengono salvati con il file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Mostra copia conoscenza e copia conoscenza nascosta (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Mostra il messaggio</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Mostra il documento grezzo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Scrivi una risposta al mittente.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Rispondi a tutti</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Scrivi una risposta al mittente e a tutti gli altri destinatari del messaggio. I destinatari in copia nascosta non sono inclusi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Inoltra</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Inoltra questo messaggio, con i relativi allegati.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Sola lettura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Blocca questo messaggio in modo che non possa essere modificato o riscritto. Rispondi e Inoltra continuano a funzionare e creano nuovi messaggi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Mostra ciò che è noto su questo messaggio: le sue firme, la sua struttura e le sue intestazioni.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Firmato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Allega file...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Salva...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Salva tutti...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Questo messaggio è aperto solo per ispezione. Non può essere modificato o riscritto; Rispondi e Inoltra funzionano ancora e producono nuovi messaggi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Questo messaggio è firmato. Rimuovi la firma prima di modificarlo. Una modifica sotto una firma viene considerata una falsificazione.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Questo messaggio è stato scritto in HTML. Viene mostrato come sorgente, non renderizzato: nulla qui carica immagini né segue collegamenti.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Sola lettura. Questi byte sono protetti. Rimuovi la firma o decifra il messaggio per modificarli.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Non è stato possibile assemblare questo messaggio per l&apos;ispezione, quindi non c&apos;è nulla da mostrare qui. Il messaggio stesso è invariato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>Impossibile rispondere</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>Impossibile rispondere a tutti</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>Impossibile inoltrare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">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="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Il nuovo messaggio non ha potuto essere assemblato. Di solito significa che una parte dell&apos;originale non ha potuto essere ricodificata, il più delle volte un allegato.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Non è stato possibile aprire una scheda per il nuovo messaggio.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">I destinatari non sono indicati, quindi se puoi aprire questo messaggio non si può sapere finché non provi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Non possiedi una chiave privata per nessuno di questi indirizzi. A meno che il messaggio non sia stato cifrato anche con una chiave non indicata qui, non può essere aperto su questo computer.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>Possiedi la chiave privata per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>Possiedi chiavi private per %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Cifrato, firma non verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Firma non verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Cifrato, firma verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Firma verificata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Firmato da un indirizzo diverso</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Firma o chiave scaduta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Firmato da una chiave sconosciuta</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Firma errata</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>firmato, non verificato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>firmato, impossibile verificare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>firma non valida</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Alcune parti sono al di fuori della sezione firmata di questo messaggio. Non sono coperte dalla firma e potrebbero essere state aggiunte da chiunque.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 allegato</translation>
+        <translation type="vanished">1 allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 allegati</translation>
+        <translation type="vanished">%1 allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Messaggio e-mail (*.eml);;Tutti i file (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>Impossibile inviare</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Allega file</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 è una cartella</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 non è un file ordinario</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Rimuovere la firma e trasformarlo in un messaggio ordinario?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Apri, salva e gestisci gli allegati</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Altro</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Altre azioni per questo messaggio</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Questo messaggio è aperto solo per ispezione. Disattivalo in Altro.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 file · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Comprimi</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Espandi</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Mostra solo il riepilogo</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Mostra tutti gli allegati</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Importa chiave</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Copia nome</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Apri allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Salvalo invece e aprilo tu stesso se sei sicuro della sua provenienza.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Non è stato possibile creare una cartella temporanea da cui aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Non è stato possibile scrivere %1 per aprirlo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nessun programma su questo sistema è registrato per aprire %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Rimuovi allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file non siano già stati salvati, questa è l&apos;unica copia. La rimozione non può essere annullata.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ Questo messaggio proviene da un&apos;altra parte, quindi a meno che questi file
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>Salvato 1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>Salvati %1 file.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Salva allegato</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>Impossibile scrivere %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Salva allegati</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>Impossibile scrivere: %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.pl_PL.ts b/src/m_email/ts/ModuleEMail.pl_PL.ts
index 0b33030..5d9acb6 100644
--- a/src/m_email/ts/ModuleEMail.pl_PL.ts
+++ b/src/m_email/ts/ModuleEMail.pl_PL.ts
@@ -1200,401 +1200,409 @@ Jeśli problem będzie się powtarzać, rozważ skorzystanie z pomocy techniczne
         <translation type="vanished">oddziel kilka adresów średnikiem &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>DW/UDW</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>DW:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>UDW:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Wyślij...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Wyślij tę wiadomość przez skonfigurowane konto pocztowe.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Wpisz tutaj swoją wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Dodaj jeden lub więcej plików do tej wiadomości. Pliki można również przeciągnąć i upuścić na wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Usuń zaznaczone załączniki z tej wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Zapisz wybrane załączniki do folderu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Zapisz wszystkie załączniki do folderu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Ta wiadomość jest zaszyfrowana. Odszyfruj ją przed edycją.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Ta wiadomość jest zaszyfrowana i podpisana. Odszyfruj ją, a następnie usuń podpis przed edycją.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Surowe źródło</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Oddziel kilka adresów średnikiem &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Załączniki</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Więcej działań na załącznikach</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Zabezpieczona wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Te bajty są objęte podpisem lub są szyfrogramem. Usuń podpis lub odszyfruj wiadomość przed edycją jej źródła.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Zakończ edycję</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Edytuj surowe źródło</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Edytujesz surowe źródło wiadomości. To, co tu wpisujesz, jest dokumentem.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Ta wiadomość jest zablokowana do podglądu. Nie można edytować jej źródła.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Tylko do odczytu. Odblokuj, aby bezpośrednio edytować źródło wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>bez nazwy.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Ta wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Odszyfruj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Ta wiadomość jest zaszyfrowana i podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Odbiorcy nie są wymienieni w nagłówkach.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Adresowana do %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>Masz klucz prywatny do %1, więc tę wiadomość można otworzyć tutaj.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>Masz klucze prywatne do %1, więc tę wiadomość można otworzyć tutaj.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Ta wiadomość jest zaszyfrowana do kluczy, których części prywatnej nie posiadasz, więc nie można jej otworzyć na tym komputerze.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Niektórzy odbiorcy tej wiadomości celowo nie zostali wymienieni, więc nie sposób stwierdzić, czy możesz ją otworzyć, dopóki nie spróbujesz.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>Odbiorców tej wiadomości nie można odczytać, więc nie sposób stwierdzić, czy możesz ją otworzyć, dopóki nie spróbujesz.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>Odbiorcy nie są wymienieni, więc nie sposób stwierdzić, czy możesz otworzyć tę wiadomość, dopóki nie spróbujesz.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>dołącz klucz publiczny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>dodaj tekst do tej wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Wiadomość zablokowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Ta wiadomość jest otwarta tylko do podglądu, więc nie można %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Wiadomość jest zaszyfrowana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Odszyfruj tę wiadomość, zanim spróbujesz %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Wiadomość jest podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>To jest wersja robocza, którą wciąż piszesz, a nie odebrana wiadomość, więc nie ma tu jeszcze nic do zrobienia.</translation>
+        <translation type="vanished">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="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Tej wiadomości nie można edytować: jest podpisana lub zaszyfrowana, więc jest już chroniona przed zmianą.</translation>
+        <translation type="vanished">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="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Nie skonfigurowano jeszcze żadnego konta pocztowego. Dodaj je w Ustawieniach, w obszarze Konta pocztowe, a ta wiadomość będzie mogła zostać wysłana.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Uzupełnij, od kogo pochodzi ta wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Adres nadawcy nie wygląda na adres e-mail.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Dodaj co najmniej jednego odbiorcę.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Nadaj tej wiadomości temat.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>To nie wygląda na adres e-mail: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Zaszyfrowane</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>Nie można było sprawdzić podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Nieprawidłowa struktura OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>Nie podpisano ani nie zaszyfrowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Ta wiadomość jest zablokowana do wglądu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Szyfruj...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Szyfruj i podpisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Weryfikuj podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Szczegóły podpisu...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Podpisz ponownie innym kluczem...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Usuń podpis...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Odszyfruj i zweryfikuj</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Szczegóły szyfrowania...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Szczegóły...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Najpierw odszyfruj tę wiadomość.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Co jest nie tak z tą wiadomością?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Spróbuj mimo wszystko zweryfikować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Spróbuj mimo wszystko odszyfrować</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Podpis nieosiągalny</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Podpis znajduje się w zaszyfrowanej części tej wiadomości. Najpierw ją odszyfruj.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Nie ma czego usunąć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Ta wiadomość nie zawiera podpisu.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>Nie można usunąć podpisu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Ta wiadomość nie jest wystarczająco zgodna z RFC 3156, aby bezpiecznie usunąć z niej podpis. Zamiast tego edytuj surowy tekst źródłowy.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Usuń podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Podpis zostanie odrzucony, a wiadomość stanie się zwykłą, niepodpisaną. Sama wiadomość pozostanie dokładnie taka, jak jest. Tej operacji nie można cofnąć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>podpisana</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>niepodpisana</translation>
     </message>
@@ -1617,42 +1625,42 @@ Podpis zostanie odrzucony, a wiadomość stanie się zwykłą, niepodpisaną. Sa
         <translation type="vanished">Nie można wysłać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Ta wiadomość wymaga nadawcy i co najmniej jednego odbiorcy, zanim będzie można ją wysłać.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Struktura</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Bezpieczeństwo</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Szczegóły wiadomości</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>Nagłówki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Odbiorcy ukryci nigdy nie są zapisywani w wiadomości: nagłówek Bcc ujawniłby każdemu odbiorcy, kto otrzymał kopię ukrytą. Są oni używani do wyboru odbiorców szyfrowania i nie są zapisywani razem z plikiem.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Pokaż DW i UDW (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Pokaż wiadomość</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Pokaż surowy dokument</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Odpowiedz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Napisz odpowiedź do nadawcy.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Odpowiedz wszystkim</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Napisz odpowiedź do nadawcy i wszystkich pozostałych adresatów. Odbiorcy ukryci nie są uwzględniani.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Przekaż</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Przekaż tę wiadomość wraz z załącznikami.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Tylko do odczytu</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Zablokuj tę wiadomość, aby nie można było jej edytować ani modyfikować. Odpowiedź i przekazanie nadal działają i tworzą nowe wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Pokaż, co wiadomo o tej wiadomości: jej podpisy, strukturę i nagłówki.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Podpisano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Załącz plik...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Zapisz...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Zapisz wszystko...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Ta wiadomość jest otwarta wyłącznie do podglądu. Nie można jej edytować ani przepisać; Odpowiedz i Przekaż nadal działają i tworzą nowe wiadomości.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Ta wiadomość jest podpisana. Usuń podpis przed jej edycją. Edycja pod podpisem jest odczytywana jako fałszerstwo.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Ta wiadomość została napisana w HTML. Jest pokazywana jako źródło, a nie renderowana: nic tutaj nie ładuje obrazów ani nie otwiera linków.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Tylko do odczytu. Te bajty są chronione. Usuń podpis lub odszyfruj wiadomość, aby je edytować.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Nie można było przygotować tej wiadomości do podglądu, więc nie ma tu nic do pokazania. Sama wiadomość pozostaje niezmieniona.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>Nie można odpowiedzieć</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>Nie można odpowiedzieć wszystkim</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>Nie można przekazać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">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="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Nowa wiadomość nie mogła zostać złożona. Zwykle oznacza to, że część oryginalnej wiadomości nie mogła zostać ponownie zakodowana, najczęściej załącznik.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Nie można było otworzyć karty dla nowej wiadomości.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">Odbiorcy nie są wymienieni, więc nie można stwierdzić, czy możesz to otworzyć, dopóki nie spróbujesz.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>Nie posiadasz klucza prywatnego dla żadnego z tych adresów. Jeśli wiadomość nie została również zaszyfrowana do klucza, który nie jest tutaj wymieniony, nie można jej otworzyć na tym komputerze.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>Posiadasz klucz prywatny dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>Posiadasz klucze prywatne dla %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Zaszyfrowano, podpis nie sprawdzony</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Podpis niezweryfikowany</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Zaszyfrowano, podpis zweryfikowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Podpis zweryfikowano</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Podpisano innym adresem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Podpis lub klucz wygasł</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Podpisano nieznanym kluczem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Nieprawidłowy podpis</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>podpisany, niezweryfikowany</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>podpisana, nie można było sprawdzić</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>podpis nieprawidłowy</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Niektóre części znajdują się poza podpisaną sekcją tej wiadomości. Nie są objęte podpisem i mogły zostać dodane przez kogokolwiek.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 załącznik</translation>
+        <translation type="vanished">1 załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>Załączniki: %1</translation>
+        <translation type="vanished">Załączniki: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Wiadomość e-mail (*.eml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>Nie można wysłać</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Załącz pliki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 to folder</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 nie jest zwykłym plikiem</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Usunąć podpis i uczynić z niej zwykłą wiadomość?</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Otwieraj, zapisuj i zarządzaj załącznikami</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Więcej</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Więcej działań dla tej wiadomości</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Ta wiadomość jest otwarta tylko do wglądu. Wyłącz to w menu Więcej.</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>Pliki: %1 · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Zwiń</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Rozwiń</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Pokaż tylko podsumowanie</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Pokaż wszystkie załączniki</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Importuj klucz</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Kopiuj nazwę</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Otwórz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Zapisz go zamiast tego i otwórz sam, jeśli masz pewność, skąd pochodzi.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Nie można było utworzyć folderu tymczasowego do otwarcia %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Nie można było zapisać %1, aby go otworzyć.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>Nic w tym systemie nie jest zarejestrowane do otwierania %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Usuń załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapisane, to jest to jedyna ich kopia. Usunięcie ich nie może być cofnięte.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ Ta wiadomość pochodzi skądinąd, więc jeśli te pliki nie zostały już zapi
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>Zapisano 1 plik.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>Zapisano %1 plików.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Zapisz załącznik</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>Nie można zapisać %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Zapisz załączniki</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>Nie można zapisać: %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.ru_RU.ts b/src/m_email/ts/ModuleEMail.ru_RU.ts
index fd7968a..626babd 100644
--- a/src/m_email/ts/ModuleEMail.ru_RU.ts
+++ b/src/m_email/ts/ModuleEMail.ru_RU.ts
@@ -1200,401 +1200,409 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">разделяйте несколько адресов символом &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>Копия/Скрытая копия</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>Кому:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>Копия:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>Скрытая копия:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>Отправить...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>Отправить это сообщение через настроенную учётную запись почты.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>Напишите ваше сообщение здесь.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>Добавьте один или несколько файлов в это сообщение. Файлы также можно перетащить в сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>Удалить выбранные вложения из этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>Сохранить выбранные вложения в папку.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>Сохранить все вложения в папку.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>Это сообщение зашифровано. Расшифруйте его перед редактированием.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>Это сообщение зашифровано и подписано. Расшифруйте его, затем удалите подпись перед редактированием.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>Исходный код</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>Разделяйте несколько адресов символом &quot;;&quot;</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>Вложения</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">Другие действия с вложениями</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>Защищённое сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>Эти байты покрыты подписью или являются шифротекстом. Удалите подпись или расшифруйте сообщение перед редактированием его исходного кода.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>Завершить редактирование</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>Редактировать исходный код</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>Вы редактируете исходный код сообщения. Всё, что вы вводите здесь, является документом.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>Это сообщение заблокировано для просмотра. Его исходный код нельзя редактировать.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>Только чтение. Разблокируйте для непосредственного редактирования исходного кода сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>Безымянный.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>Это сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>Расшифровать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>Это сообщение зашифровано и подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>Получатели не указаны в заголовках.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>Адресовано: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>У вас есть закрытый ключ для %1, поэтому это сообщение можно открыть здесь.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>У вас есть закрытые ключи для %1, поэтому это сообщение можно открыть здесь.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>Это сообщение зашифровано для ключей, закрытые части которых у вас отсутствуют, поэтому его нельзя открыть на этом компьютере.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>Некоторые получатели этого сообщения намеренно не указаны, поэтому невозможно узнать, сможете ли вы его открыть, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>Получателей этого сообщения невозможно прочитать, поэтому невозможно узнать, сможете ли вы его открыть, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>Получатели не указаны, поэтому невозможно узнать, сможете ли вы открыть его, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>Прикрепить открытый ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>Добавить текст в это сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>Сообщение заблокировано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>Это сообщение открыто только для просмотра, поэтому невозможно %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>Сообщение зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>Расшифруйте это сообщение, прежде чем пытаться %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>Сообщение подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>Это черновик, который вы всё ещё пишете, а не полученное сообщение, поэтому здесь пока нет доступных действий.</translation>
+        <translation type="vanished">Это черновик, который вы всё ещё пишете, а не полученное сообщение, поэтому здесь пока нет доступных действий.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>Это сообщение в любом случае нельзя редактировать: оно подписано или зашифровано, поэтому уже защищено от переписывания.</translation>
+        <translation type="vanished">Это сообщение в любом случае нельзя редактировать: оно подписано или зашифровано, поэтому уже защищено от переписывания.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>Почтовый аккаунт ещё не настроен. Добавьте его в настройках, в разделе «Почтовые аккаунты», и это сообщение можно будет отправить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>Укажите, от кого это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>Адрес в поле «От» не похож на адрес электронной почты.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>Добавьте хотя бы одного получателя.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>Укажите тему этого сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>Это не похоже на адрес электронной почты: %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>Зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>Не удалось проверить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>Некорректная структура OpenPGP</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>Не подписано и не зашифровано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>Это сообщение заблокировано для просмотра.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>Подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>Зашифровать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>Зашифровать и подписать...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>Проверить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>Сведения о подписи...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>Подписать снова другим ключом...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>Удалить подпись...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>Расшифровать и проверить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>Сведения о шифровании...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>Подробнее...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>Сначала расшифруйте это сообщение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>Что не так с этим сообщением?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>Попробовать проверить в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>Попробовать расшифровать в любом случае</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>Подпись недоступна</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>Подпись находится внутри зашифрованной части этого сообщения. Сначала расшифруйте его.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>Нечего удалять</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>Это сообщение не содержит подписи.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>Невозможно удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>Это сообщение недостаточно соответствует RFC 3156, чтобы безопасно удалить его подпись. Вместо этого отредактируйте исходный текст.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>Удалить подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 Подпись будет отброшена, и сообщение станет обычным, без подписи. Само сообщение останется без изменений. Это действие нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>без подписи</translation>
     </message>
@@ -1617,42 +1625,42 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
         <translation type="vanished">Не удается отправить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>Для отправки этого сообщения необходимы отправитель и хотя бы один получатель.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>Структура</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>Сведения о сообщении</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>Заголовки</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 Скрытые получатели никогда не записываются в сообщение: заголовок Bcc сообщил бы каждому получателю, кто был в скрытой копии. Они используются для выбора получателей шифрования и не сохраняются вместе с файлом.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>Показать копию и скрытую копию (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>Показать сообщение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>Показать исходный документ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>Написать ответ отправителю.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>Ответить всем</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>Написать ответ отправителю и всем, кому было адресовано письмо. Скрытые получатели не включаются.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>Переслать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>Переслать это сообщение вместе с вложениями.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>Только чтение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>Заблокировать это сообщение, чтобы его нельзя было редактировать или переписывать. Ответить и Переслать по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>Показать, что известно об этом сообщении: его подписи, структуру и заголовки.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>Подписано</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>Прикрепить файл...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>Сохранить...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>Сохранить все...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>Это сообщение открыто только для просмотра. Его нельзя редактировать или переписывать; функции ответа и пересылки по-прежнему работают и создают новые сообщения.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>Это сообщение подписано. Удалите подпись перед редактированием. Правка под подписью воспринимается как подделка.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>Это сообщение написано в HTML. Оно показано в виде исходного кода, а не в отрисованном виде: здесь не загружаются изображения и не открываются ссылки.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>Только для чтения. Эти байты защищены. Удалите подпись или расшифруйте сообщение, чтобы редактировать их.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>Это сообщение не удалось собрать для просмотра, поэтому здесь нечего показывать. Само сообщение не изменено.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>Невозможно ответить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>Невозможно ответить всем</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>Невозможно переслать</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">Новое сообщение не может быть открыто отсюда, потому что это представление находится не в окне с вкладками.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>Не удалось собрать новое сообщение. Обычно это означает, что часть исходного сообщения не удалось перекодировать, чаще всего вложение.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>Не удалось открыть вкладку для нового сообщения.</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">Получатели не указаны, поэтому нельзя сказать, можно ли открыть это сообщение, пока не попробуете.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>У вас нет закрытого ключа ни для одного из этих адресов. Если только сообщение не было также зашифровано для ключа, который здесь не указан, его нельзя открыть на этом компьютере.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>У вас есть закрытый ключ для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>У вас есть закрытые ключи для %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 Удалить подпись и сделать его обычным сообщением?</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>Зашифровано, подпись не проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>Подпись не проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>Зашифровано, подпись проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>Подпись проверена</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>Подписано другим адресом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>Срок действия подписи или ключа истёк</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>Подписано неизвестным ключом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>Недействительная подпись</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>подписано, не проверено</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>подписано, проверить не удалось</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>подпись недействительна</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>Некоторые части находятся вне подписанного раздела этого сообщения. Они не покрыты подписью и могли быть добавлены кем угодно.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 вложение</translation>
+        <translation type="vanished">1 вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 вложений</translation>
+        <translation type="vanished">%1 вложений</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>Электронное письмо (*.eml);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>Не удается отправить</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>Прикрепить файлы</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 — это папка</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 не является обычным файлом</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>Открыть, сохранить и управлять вложениями</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>Ещё</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>Другие действия с этим сообщением</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>Сообщение открыто только для просмотра. Отключить можно в меню «Ещё».</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>Файлов: %1 · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>Свернуть</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>Развернуть</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>Показать только сводку</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>Показать все вложения</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>Импортировать ключ</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>Копировать имя</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>Открыть вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 Сохраните его, а затем откройте самостоятельно, если вы уверены в его источнике.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>Не удалось создать временную папку для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>Не удалось записать %1 для открытия.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>В этой системе ни одна программа не зарегистрирована для открытия %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>Удалить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 Это сообщение получено откуда-то ещё, поэтому, если эти файлы ещё не сохранены, это единственная их копия. Удаление нельзя отменить.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>Сохранён 1 файл.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>Сохранено файлов: %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>Сохранить вложение</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>Не удалось записать %1.</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>Сохранить вложения</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>Не удалось записать: %1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.zh_CN.ts b/src/m_email/ts/ModuleEMail.zh_CN.ts
index 7e114eb..8ee1445 100644
--- a/src/m_email/ts/ModuleEMail.zh_CN.ts
+++ b/src/m_email/ts/ModuleEMail.zh_CN.ts
@@ -1200,401 +1200,409 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">用&quot;;&quot;分隔多个地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>抄送/密送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>收件人:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>抄送:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>密送:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>发送...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>通过已配置的邮件账户发送此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>在此处撰写您的消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>向此消息添加一个或多个文件。也可以将文件拖放到消息上。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>从消息中移除选中的附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>将选定的附件写入文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>将所有附件写入文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>此消息已加密。编辑前请先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>此消息已加密并签名。编辑前请先解密，然后移除签名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>原始源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>用&quot;;&quot;分隔多个地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">更多附件操作</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>受保护消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>这些字节受签名保护，或是密文。编辑其源前，请先移除签名或解密消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>停止编辑</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>编辑原始源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>您正在编辑原始消息源。您在此输入的内容就是文档。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>此消息已锁定以供检查。无法编辑其源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>只读。解锁后可直接编辑消息源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>未命名.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>此消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>此消息已加密并签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>邮件头中未指明接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>收件人：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>您持有 %1 的私钥，因此可以在此处打开此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>您持有 %1 的私钥，因此可以在此处打开此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>此消息加密到的密钥，您并不持有对应的私钥，因此无法在此计算机上打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>此消息的部分接收者被故意未指明，因此在尝试之前无法判断您能否打开它。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>此消息的接收者无法读取，因此尝试之前无法判断您能否打开它。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>未列出接收者，因此只有尝试后才能知道您能否打开此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>附加公钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>向此消息添加文本</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>消息已锁定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>此消息仅供查看，因此无法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>消息已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>请先解密此消息，再尝试%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>消息已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>这是您仍在撰写的草稿，不是已收到的邮件，因此目前没有可操作的内容。</translation>
+        <translation type="vanished">这是您仍在撰写的草稿，不是已收到的邮件，因此目前没有可操作的内容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>此邮件无论如何都无法编辑：它已签名或加密，因此已受到保护，无法被重写。</translation>
+        <translation type="vanished">此邮件无论如何都无法编辑：它已签名或加密，因此已受到保护，无法被重写。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>尚未设置邮件账户。请在“设置”的“邮件账户”下添加一个账户，然后即可发送此邮件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>请填写此邮件的发件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>发件人地址看起来不像电子邮件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>请至少添加一个收件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>请为此邮件填写主题。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>这看起来不像电子邮件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>无法检查签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>OpenPGP 结构格式错误</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>既未签名也未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>此邮件已锁定，仅供查看。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>加密并签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>验证签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>签名详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>使用另一密钥重新签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>移除签名...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>解密并验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>加密详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>详情...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>请先解密此消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>此消息有什么问题？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>仍然尝试验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>仍然尝试解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>无法获取签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>签名位于此消息的加密部分中。请先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>没有可移除的内容</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>此消息不包含签名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>无法移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>此消息未严格遵循 RFC 3156，无法安全地移除其签名。请改为编辑原始源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>移除签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 签名将被丢弃，消息将变为普通的未签名消息。消息本身将保持原样。此操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>未签名</translation>
     </message>
@@ -1617,42 +1625,42 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
         <translation type="vanished">无法发送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>此消息需要发件人和至少一个接收者才能发送。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>结构</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>消息详情</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>邮件头</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 密件接收者永远不会写入消息中：Bcc 头会告诉每个接收者谁被密件抄送。它们用于选择加密接收者，并且不会随文件保存。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>显示抄送和密件抄送 (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>显示消息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>显示原始文档</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>向发件人写回复。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>全部回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>向发件人及所有收件人写回复。不包括密送接收者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>转发</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>将此消息连同附件转发。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>只读</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>锁定此消息，使其无法编辑或重写。回复和转发仍然有效，并生成新消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>显示此消息的已知信息：其签名、结构和邮件头。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>已签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>附加文件...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>保存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>全部保存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>此消息仅供查看。无法编辑或重写；回复和转发仍然有效，并会生成新消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>此消息已签名。编辑前请移除签名。在签名下进行编辑会被视为伪造。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>此消息以 HTML 编写。显示的是其源代码而非渲染结果：此处不会加载图片或打开链接。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>只读。这些字节受保护。要编辑它们，请移除签名或解密消息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>无法组装此消息以供检查，因此这里没有可显示的内容。消息本身未更改。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>无法回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>无法全部回复</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>无法转发</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">无法从此处打开新消息，因为此视图不在包含标签页的窗口中。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>无法组装新消息。这通常意味着原始消息的某个部分无法重新编码，最常见的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>无法为新消息打开标签页。</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">未列出接收者，因此能否打开此消息只有尝试后才能知道。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>您不持有这些地址中任何一个的私钥。除非消息还加密到了此处未列出的密钥，否则无法在这台计算机上打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>您持有 %1 的私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>您持有 %1 的多个私钥。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 是否移除签名并将其变为普通消息？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>已加密，未检查签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>签名未检查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>已加密，签名已验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>签名已验证</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>由不同的地址签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>签名或密钥已过期</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>由未知密钥签名</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>签名无效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>已签名，未检查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>已签名，无法检查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>签名不正确</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>此消息的某些部分位于签名部分之外。它们不受签名保护，任何人都可能添加。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 个附件</translation>
+        <translation type="vanished">1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 个附件</translation>
+        <translation type="vanished">%1 个附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>电子邮件 (*.eml);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>无法发送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>添加附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 是一个文件夹</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 不是普通文件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>打开、保存和管理附件</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>更多</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>此邮件的更多操作</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>此邮件仅供检查。可在“更多”中关闭。</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 个文件 · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>收起</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>展开</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>仅显示摘要</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>显示所有附件</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>导入密钥</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>复制名称</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>打开附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 请改为保存它，如果您确定其来源，再自行打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>无法创建用于打开 %1 的临时文件夹。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>无法写出 %1 以将其打开。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>此系统上没有注册可打开 %1 的程序。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 这封邮件来自其他地方，因此除非这些文件已保存，否则这是唯一的副本。移除操作无法撤销。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>已保存 1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>已保存 %1 个文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>无法写入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>保存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>无法写入：%1</translation>
     </message>
diff --git a/src/m_email/ts/ModuleEMail.zh_TW.ts b/src/m_email/ts/ModuleEMail.zh_TW.ts
index 88ecd82..0565820 100644
--- a/src/m_email/ts/ModuleEMail.zh_TW.ts
+++ b/src/m_email/ts/ModuleEMail.zh_TW.ts
@@ -1200,401 +1200,409 @@ If the issue persists, consider seeking technical support or consulting the docu
         <translation type="vanished">以「;」分隔多個地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="577"/>
+        <location filename="../EMailPageView.cpp" line="607"/>
         <source>From:</source>
         <translation>寄件者:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="590"/>
+        <location filename="../EMailPageView.cpp" line="620"/>
         <source>Cc/Bcc</source>
         <translation>副本/密件副本</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="599"/>
+        <location filename="../EMailPageView.cpp" line="629"/>
         <source>To:</source>
         <translation>收件者:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="600"/>
+        <location filename="../EMailPageView.cpp" line="630"/>
         <source>Cc:</source>
         <translation>副本:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="601"/>
+        <location filename="../EMailPageView.cpp" line="631"/>
         <source>Bcc:</source>
         <translation>密件副本:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="612"/>
+        <location filename="../EMailPageView.cpp" line="642"/>
         <source>Subject:</source>
         <translation>主旨:</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="745"/>
+        <location filename="../EMailPageView.cpp" line="771"/>
         <source>Send...</source>
         <translation>傳送...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="746"/>
+        <location filename="../EMailPageView.cpp" line="772"/>
         <source>Send this message through a configured mail account.</source>
         <translation>透過已設定的郵件帳號傳送此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="823"/>
-        <location filename="../EMailPageView.cpp" line="1303"/>
+        <location filename="../EMailPageView.cpp" line="907"/>
+        <location filename="../EMailPageView.cpp" line="1416"/>
         <source>Write your message here.</source>
         <translation>在此輸入您的訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="942"/>
+        <location filename="../EMailPageView.cpp" line="780"/>
         <source>Add one or more files to this message. Files can also be dropped onto the message.</source>
         <translation>將一或多個檔案新增至此訊息。也可以將檔案拖曳到訊息上。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="950"/>
+        <location filename="../EMailPageView.cpp" line="1035"/>
         <source>Take the selected attachments out of this message.</source>
         <translation>將選取的附件從此訊息中移除。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="953"/>
+        <location filename="../EMailPageView.cpp" line="1019"/>
         <source>Write the selected attachments to a folder.</source>
         <translation>將選取的附件寫入資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1024"/>
         <source>Write every attachment to a folder.</source>
         <translation>將所有附件寫入資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1214"/>
+        <location filename="../EMailPageView.cpp" line="1327"/>
         <source>This message is encrypted. Decrypt it before editing it.</source>
         <translation>此訊息已加密。編輯前請先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1218"/>
+        <location filename="../EMailPageView.cpp" line="1331"/>
         <source>This message is encrypted and signed. Decrypt it, then remove the signature, before editing it.</source>
         <translation>此訊息已加密並簽署。編輯前請先解密，然後移除簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Raw Source</source>
         <translation>原始來源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="552"/>
+        <location filename="../EMailPageView.cpp" line="582"/>
         <source>Separate several addresses with &quot;;&quot;</source>
         <translation>以 &quot;;&quot; 分隔多個地址</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1475"/>
+        <location filename="../EMailPageView.cpp" line="828"/>
+        <location filename="../EMailPageView.cpp" line="977"/>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>More attachment actions</source>
+        <translation type="vanished">更多附件操作</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="1590"/>
         <source>Protected Message</source>
         <translation>受保護的訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1476"/>
-        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="1591"/>
+        <location filename="../EMailPageView.cpp" line="3713"/>
         <source>These bytes are covered by a signature, or are ciphertext. Remove the signature, or decrypt the message, before editing its source.</source>
         <translation>這些位元組受簽章保護，或為密文。編輯其來源前，請先移除簽章或解密訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1498"/>
+        <location filename="../EMailPageView.cpp" line="1613"/>
         <source>Stop Editing</source>
         <translation>停止編輯</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1499"/>
+        <location filename="../EMailPageView.cpp" line="1614"/>
         <source>Edit Raw Source</source>
         <translation>編輯原始來源</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1505"/>
+        <location filename="../EMailPageView.cpp" line="1620"/>
         <source>You are editing the raw message source. What you type here is the document.</source>
         <translation>您正在編輯原始訊息來源。您在此輸入的內容即為文件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1512"/>
-        <location filename="../EMailPageView.cpp" line="3597"/>
+        <location filename="../EMailPageView.cpp" line="1627"/>
+        <location filename="../EMailPageView.cpp" line="3710"/>
         <source>This message is locked for inspection. Its source cannot be edited.</source>
         <translation>此訊息已鎖定以供檢視。其來源無法編輯。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1521"/>
+        <location filename="../EMailPageView.cpp" line="1636"/>
         <source>Read-only. Unlock to edit the message source directly.</source>
         <translation>唯讀。解鎖後即可直接編輯訊息來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1761"/>
+        <location filename="../EMailPageView.cpp" line="1876"/>
         <source>untitled.eml</source>
         <translation>未命名.eml</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1793"/>
-        <location filename="../EMailPageView.cpp" line="1842"/>
+        <location filename="../EMailPageView.cpp" line="1908"/>
+        <location filename="../EMailPageView.cpp" line="1957"/>
         <source>This message is encrypted</source>
         <translation>此郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1821"/>
-        <location filename="../EMailPageView.cpp" line="2602"/>
-        <location filename="../EMailPageView.cpp" line="2613"/>
+        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2633"/>
+        <location filename="../EMailPageView.cpp" line="2644"/>
         <source>Decrypt</source>
         <translation>解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1841"/>
+        <location filename="../EMailPageView.cpp" line="1956"/>
         <source>This message is encrypted and signed</source>
         <translation>此郵件已加密並簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1865"/>
+        <location filename="../EMailPageView.cpp" line="1980"/>
         <source>The recipients are not named in the headers.</source>
         <translation>收件者未在標頭中指名。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1866"/>
+        <location filename="../EMailPageView.cpp" line="1981"/>
         <source>Addressed to %1</source>
         <translation>收件者：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1933"/>
+        <location filename="../EMailPageView.cpp" line="2048"/>
         <source>You hold the private key for %1, so this message can be opened here.</source>
         <translation>您持有 %1 的私鑰，因此此郵件可以在這裡開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1936"/>
+        <location filename="../EMailPageView.cpp" line="2051"/>
         <source>You hold private keys for %1, so this message can be opened here.</source>
         <translation>您持有 %1 的多個私鑰，因此此郵件可以在這裡開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1945"/>
+        <location filename="../EMailPageView.cpp" line="2060"/>
         <source>This message is encrypted to keys you do not hold the private half of, so it cannot be opened on this computer.</source>
         <translation>此郵件已使用您未持有對應私鑰的金鑰加密，因此無法在此電腦上開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1953"/>
+        <location filename="../EMailPageView.cpp" line="2068"/>
         <source>Some recipients of this message were deliberately not named, so there is no way to tell whether you can open it until you try.</source>
         <translation>此郵件的部分收件者刻意未在標頭中指名，因此在嘗試之前無法得知您是否能開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1956"/>
+        <location filename="../EMailPageView.cpp" line="2071"/>
         <source>The recipients of this message cannot be read, so there is no way to tell whether you can open it until you try.</source>
         <translation>此郵件的收件者資訊無法讀取，因此在嘗試之前無法得知您是否能開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1994"/>
+        <location filename="../EMailPageView.cpp" line="2109"/>
         <source>The recipients are not named, so there is no way to tell whether you can open this until you try.</source>
         <translation>收件者未具名，因此在你嘗試之前無從得知是否能開啟此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2028"/>
+        <location filename="../EMailPageView.cpp" line="2143"/>
         <source>attach a public key</source>
         <translation>附加公鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2049"/>
+        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>add text to this message</source>
         <translation>新增文字至此郵件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2066"/>
+        <location filename="../EMailPageView.cpp" line="2181"/>
         <source>Message Locked</source>
         <translation>郵件已鎖定</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2067"/>
+        <location filename="../EMailPageView.cpp" line="2182"/>
         <source>This message is open for inspection only, so it is not possible to %1.</source>
         <translation>此郵件僅供檢視，因此無法%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2076"/>
+        <location filename="../EMailPageView.cpp" line="2191"/>
         <source>Message Is Encrypted</source>
         <translation>郵件已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2077"/>
+        <location filename="../EMailPageView.cpp" line="2192"/>
         <source>Decrypt this message before trying to %1.</source>
         <translation>請先解密此郵件，再嘗試%1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2085"/>
+        <location filename="../EMailPageView.cpp" line="2200"/>
         <source>Message Is Signed</source>
         <translation>郵件已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>This is a draft you are still writing, not a message that was received, so there is nothing here to act on yet.</source>
-        <translation>這是您仍在撰寫的草稿，不是已收到的訊息，因此這裡還沒有任何可處理的內容。</translation>
+        <translation type="vanished">這是您仍在撰寫的草稿，不是已收到的訊息，因此這裡還沒有任何可處理的內容。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2164"/>
         <source>This message cannot be edited anyway: it is signed or encrypted, so it is already protected from being rewritten.</source>
-        <translation>此訊息本來就無法編輯：它已簽署或加密，因此已受到保護，無法被改寫。</translation>
+        <translation type="vanished">此訊息本來就無法編輯：它已簽署或加密，因此已受到保護，無法被改寫。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2278"/>
+        <location filename="../EMailPageView.cpp" line="2360"/>
         <source>No mail account is set up yet. Add one in Settings, under Mail Accounts, and this message can be sent.</source>
         <translation>尚未設定郵件帳戶。請在「設定」的「郵件帳戶」下新增一個帳戶，即可傳送此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2281"/>
+        <location filename="../EMailPageView.cpp" line="2363"/>
         <source>Fill in who this message is from.</source>
         <translation>請填寫此訊息的寄件人。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2283"/>
+        <location filename="../EMailPageView.cpp" line="2365"/>
         <source>The From address does not look like an e-mail address.</source>
         <translation>寄件人地址看起來不像電子郵件地址。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2285"/>
+        <location filename="../EMailPageView.cpp" line="2367"/>
         <source>Add at least one recipient.</source>
         <translation>請至少新增一位收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2287"/>
+        <location filename="../EMailPageView.cpp" line="2369"/>
         <source>Give this message a subject.</source>
         <translation>請為此訊息填寫主旨。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2296"/>
+        <location filename="../EMailPageView.cpp" line="2378"/>
         <source>This does not look like an e-mail address: %1</source>
         <translation>這看起來不像電子郵件地址：%1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2418"/>
+        <location filename="../EMailViewLayout.cpp" line="120"/>
         <source>Encrypted</source>
         <translation>已加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2454"/>
+        <location filename="../EMailViewLayout.cpp" line="157"/>
         <source>Signature could not be checked</source>
         <translation>無法檢查簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2458"/>
+        <location filename="../EMailViewLayout.cpp" line="161"/>
         <source>Malformed OpenPGP structure</source>
         <translation>OpenPGP 結構格式錯誤</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2465"/>
+        <location filename="../EMailViewLayout.cpp" line="171"/>
         <source>Not signed or encrypted</source>
         <translation>未簽署且未加密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2567"/>
+        <location filename="../EMailPageView.cpp" line="2598"/>
         <source>This message is locked for inspection.</source>
         <translation>此訊息已鎖定，僅供檢視。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2582"/>
+        <location filename="../EMailPageView.cpp" line="2613"/>
         <source>Sign...</source>
         <translation>簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2583"/>
+        <location filename="../EMailPageView.cpp" line="2614"/>
         <source>Encrypt...</source>
         <translation>加密...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2584"/>
+        <location filename="../EMailPageView.cpp" line="2615"/>
         <source>Encrypt and Sign...</source>
         <translation>加密並簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2588"/>
+        <location filename="../EMailPageView.cpp" line="2619"/>
         <source>Verify Signature</source>
         <translation>驗證簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2589"/>
+        <location filename="../EMailPageView.cpp" line="2620"/>
         <source>Signature Details...</source>
         <translation>簽章詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2593"/>
+        <location filename="../EMailPageView.cpp" line="2624"/>
         <source>Sign Again With Another Key...</source>
         <translation>使用另一個金鑰重新簽署...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2594"/>
-        <location filename="../EMailPageView.cpp" line="2619"/>
+        <location filename="../EMailPageView.cpp" line="2625"/>
+        <location filename="../EMailPageView.cpp" line="2650"/>
         <source>Remove Signature...</source>
         <translation>移除簽章...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2603"/>
-        <location filename="../EMailPageView.cpp" line="2612"/>
+        <location filename="../EMailPageView.cpp" line="2634"/>
+        <location filename="../EMailPageView.cpp" line="2643"/>
         <source>Decrypt and Verify</source>
         <translation>解密並驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2605"/>
+        <location filename="../EMailPageView.cpp" line="2636"/>
         <source>Encryption Details...</source>
         <translation>加密詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="780"/>
-        <location filename="../EMailPageView.cpp" line="2615"/>
+        <location filename="../EMailPageView.cpp" line="787"/>
+        <location filename="../EMailPageView.cpp" line="2646"/>
         <source>Details...</source>
         <translation>詳細資料...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2629"/>
+        <location filename="../EMailPageView.cpp" line="2660"/>
         <source>Decrypt this message first.</source>
         <translation>請先解密此訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2638"/>
+        <location filename="../EMailPageView.cpp" line="2669"/>
         <source>What Is Wrong With This Message?</source>
         <translation>此訊息有什麼問題？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2642"/>
+        <location filename="../EMailPageView.cpp" line="2673"/>
         <source>Try to Verify Anyway</source>
         <translation>仍嘗試驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2643"/>
+        <location filename="../EMailPageView.cpp" line="2674"/>
         <source>Try to Decrypt Anyway</source>
         <translation>仍嘗試解密</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2658"/>
+        <location filename="../EMailPageView.cpp" line="2689"/>
         <source>Signature Not Reachable</source>
         <translation>無法取得簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2659"/>
+        <location filename="../EMailPageView.cpp" line="2690"/>
         <source>The signature is inside the encrypted part of this message. Decrypt it first.</source>
         <translation>簽章位於此訊息的加密部分。請先解密。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2663"/>
+        <location filename="../EMailPageView.cpp" line="2694"/>
         <source>Nothing to Remove</source>
         <translation>沒有可移除的簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2664"/>
+        <location filename="../EMailPageView.cpp" line="2695"/>
         <source>This message carries no signature.</source>
         <translation>此訊息沒有簽章。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2668"/>
+        <location filename="../EMailPageView.cpp" line="2699"/>
         <source>Cannot Remove the Signature</source>
         <translation>無法移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2669"/>
+        <location filename="../EMailPageView.cpp" line="2700"/>
         <source>This message does not follow RFC 3156 closely enough to take its signature off safely. Edit the raw source instead.</source>
         <translation>此訊息未充分遵循 RFC 3156，無法安全地移除簽章。請改為編輯原始來源。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2677"/>
+        <location filename="../EMailPageView.cpp" line="2708"/>
         <source>Remove Signature</source>
         <translation>移除簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2678"/>
+        <location filename="../EMailPageView.cpp" line="2709"/>
         <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>
@@ -1603,12 +1611,12 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
 簽章將被丟棄，訊息將變成一般未簽署的訊息。訊息本身會保持原樣。此操作無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2795"/>
+        <location filename="../EMailPageView.cpp" line="2826"/>
         <source>signed</source>
         <translation>已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2821"/>
+        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>unsigned</source>
         <translation>未簽署</translation>
     </message>
@@ -1617,42 +1625,42 @@ The signature is discarded and the message becomes an ordinary, unsigned one. Th
         <translation type="vanished">無法傳送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2959"/>
+        <location filename="../EMailPageView.cpp" line="3093"/>
         <source>This message needs a sender and at least one recipient before it can be sent.</source>
         <translation>此訊息需要有寄件者和至少一位收件者才能傳送。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Message</source>
         <translation>訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="424"/>
+        <location filename="../EMailPageView.cpp" line="454"/>
         <source>Structure</source>
         <translation>結構</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="423"/>
+        <location filename="../EMailPageView.cpp" line="453"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="404"/>
+        <location filename="../EMailPageView.cpp" line="434"/>
         <source>Message Details</source>
         <translation>訊息詳細資料</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="425"/>
+        <location filename="../EMailPageView.cpp" line="455"/>
         <source>Headers</source>
         <translation>標頭</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="558"/>
+        <location filename="../EMailPageView.cpp" line="588"/>
         <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>
@@ -1661,152 +1669,151 @@ Blind recipients are never written into the message: a Bcc header would tell eve
 密件收件者永遠不會被寫入訊息中：Bcc 標頭會讓所有收件者得知誰被密件副本。密件收件者只用來選擇加密收件者，且不會隨檔案儲存。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="595"/>
+        <location filename="../EMailPageView.cpp" line="625"/>
         <source>Show carbon copy and blind carbon copy (%1)</source>
         <translation>顯示副本與密件副本 (%1)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="658"/>
-        <location filename="../EMailPageView.cpp" line="713"/>
-        <location filename="../EMailPageView.cpp" line="784"/>
-        <location filename="../EMailPageView.cpp" line="934"/>
+        <location filename="../EMailPageView.cpp" line="688"/>
+        <location filename="../EMailPageView.cpp" line="740"/>
         <source>%1 (%2)</source>
         <translation>%1 (%2)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="667"/>
+        <location filename="../EMailPageView.cpp" line="697"/>
         <source>Show the message</source>
         <translation>顯示訊息</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="669"/>
+        <location filename="../EMailPageView.cpp" line="699"/>
         <source>Show the raw document</source>
         <translation>顯示原始文件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="721"/>
+        <location filename="../EMailPageView.cpp" line="758"/>
         <source>Reply</source>
         <translation>回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="722"/>
+        <location filename="../EMailPageView.cpp" line="759"/>
         <source>Write a reply to the sender.</source>
         <translation>撰寫回覆給寄件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="725"/>
+        <location filename="../EMailPageView.cpp" line="762"/>
         <source>Reply All</source>
         <translation>全部回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="726"/>
+        <location filename="../EMailPageView.cpp" line="763"/>
         <source>Write a reply to the sender and everyone else who was addressed. Blind recipients are not included.</source>
         <translation>撰寫回覆給寄件者和所有其他收件者。不包含密件副本收件者。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="730"/>
+        <location filename="../EMailPageView.cpp" line="767"/>
         <source>Forward</source>
         <translation>轉寄</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="731"/>
+        <location filename="../EMailPageView.cpp" line="768"/>
         <source>Pass this message on, with its attachments.</source>
         <translation>轉寄此訊息及其附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="762"/>
+        <location filename="../EMailPageView.cpp" line="792"/>
+        <location filename="../EMailPageView.cpp" line="862"/>
         <source>Read-only</source>
         <translation>唯讀</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="763"/>
+        <location filename="../EMailPageView.cpp" line="793"/>
         <source>Lock this message so it cannot be edited or rewritten. Reply and Forward still work and produce new messages.</source>
         <translation>鎖定此訊息，使其無法編輯或重寫。回覆和轉寄仍可運作，並產生新訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="785"/>
+        <location filename="../EMailPageView.cpp" line="788"/>
         <source>Show what is known about this message: its signatures, its structure and its headers.</source>
         <translation>顯示此訊息的已知資訊：簽章、結構和標頭。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Signed</source>
         <translation>已簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="895"/>
+        <location filename="../EMailPageView.cpp" line="998"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="941"/>
+        <location filename="../EMailPageView.cpp" line="779"/>
         <source>Attach File...</source>
         <translation>附加檔案...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="949"/>
-        <location filename="../EMailPageView.cpp" line="3244"/>
+        <location filename="../EMailPageView.cpp" line="1033"/>
+        <location filename="../EMailPageView.cpp" line="3363"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="952"/>
-        <location filename="../EMailPageView.cpp" line="3231"/>
+        <location filename="../EMailPageView.cpp" line="1017"/>
+        <location filename="../EMailPageView.cpp" line="3350"/>
         <source>Save...</source>
         <translation>儲存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="956"/>
+        <location filename="../EMailPageView.cpp" line="1023"/>
         <source>Save All...</source>
         <translation>全部儲存...</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1205"/>
+        <location filename="../EMailPageView.cpp" line="1318"/>
         <source>This message is open for inspection only. It cannot be edited or rewritten; Reply and Forward still work, and produce new messages.</source>
         <translation>此訊息僅供檢視。無法編輯或重寫；回覆和轉寄仍可使用，並會產生新訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1225"/>
+        <location filename="../EMailPageView.cpp" line="1338"/>
         <source>This message is signed. Remove the signature before editing it. An edit under a signature reads as a forgery.</source>
         <translation>此訊息已簽署。編輯前請先移除簽章。在簽章下進行編輯會被視為偽造。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1242"/>
+        <location filename="../EMailPageView.cpp" line="1355"/>
         <source>This message was written in HTML. It is shown as its source rather than rendered: nothing here loads images or follows links.</source>
         <translation>此訊息以 HTML 撰寫。顯示為原始碼而非轉譯結果：此處不會載入圖片或連結。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1517"/>
+        <location filename="../EMailPageView.cpp" line="1632"/>
         <source>Read-only. These bytes are protected. Remove the signature, or decrypt the message, to edit them.</source>
         <translation>唯讀。這些位元組受到保護。若要編輯，請移除簽章或解密訊息。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1621"/>
+        <location filename="../EMailPageView.cpp" line="1736"/>
         <source>This message could not be assembled for inspection, so there is nothing to show here. The message itself is unchanged.</source>
         <translation>此訊息無法組裝以供檢視，因此此處沒有可顯示的內容。訊息本身未變更。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1714"/>
+        <location filename="../EMailPageView.cpp" line="1829"/>
         <source>Cannot Reply</source>
         <translation>無法回覆</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1716"/>
+        <location filename="../EMailPageView.cpp" line="1831"/>
         <source>Cannot Reply to All</source>
         <translation>無法回覆所有人</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1720"/>
+        <location filename="../EMailPageView.cpp" line="1835"/>
         <source>Cannot Forward</source>
         <translation>無法轉寄</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1726"/>
+        <location filename="../EMailPageView.cpp" line="1841"/>
         <source>
 
 This message itself has not been changed.</source>
@@ -1817,12 +1824,12 @@ This message itself has not been changed.</source>
         <translation type="vanished">無法從此處開啟新訊息，因為此檢視不在包含分頁的視窗內。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1749"/>
+        <location filename="../EMailPageView.cpp" line="1864"/>
         <source>The new message could not be assembled. This usually means a part of the original could not be re-encoded, most often an attachment.</source>
         <translation>無法組合新訊息。這通常表示原始訊息中有部分無法重新編碼，最常見的是附件。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="1776"/>
+        <location filename="../EMailPageView.cpp" line="1891"/>
         <source>A tab for the new message could not be opened.</source>
         <translation>無法開啟新訊息的分頁。</translation>
     </message>
@@ -1835,22 +1842,22 @@ This message itself has not been changed.</source>
         <translation type="vanished">收件者未具名，因此是否能開啟此訊息，必須嘗試後才能得知。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2011"/>
+        <location filename="../EMailPageView.cpp" line="2126"/>
         <source>You do not hold a private key for any of these addresses. Unless the message was also encrypted to a key that is not named here, it cannot be opened on this computer.</source>
         <translation>您未持有這些電子郵件地址中任何一個對應的私鑰。除非此訊息同時也加密到此處未列出的金鑰，否則無法在此電腦上開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2020"/>
+        <location filename="../EMailPageView.cpp" line="2135"/>
         <source>You hold the private key for %1.</source>
         <translation>您持有 %1 的私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2021"/>
+        <location filename="../EMailPageView.cpp" line="2136"/>
         <source>You hold private keys for %1.</source>
         <translation>您持有 %1 的多把私鑰。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2086"/>
+        <location filename="../EMailPageView.cpp" line="2201"/>
         <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>
@@ -1859,113 +1866,111 @@ Remove the signature and make it an ordinary message?</source>
 是否移除簽章並使其成為一般訊息？</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2425"/>
+        <location filename="../EMailViewLayout.cpp" line="127"/>
         <source>Encrypted, signature not checked</source>
         <translation>已加密，未檢查簽章</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2426"/>
+        <location filename="../EMailViewLayout.cpp" line="129"/>
         <source>Signature not checked</source>
         <translation>簽章未檢查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2430"/>
+        <location filename="../EMailViewLayout.cpp" line="133"/>
         <source>Encrypted, signature verified</source>
         <translation>已加密，簽章已驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2431"/>
+        <location filename="../EMailViewLayout.cpp" line="135"/>
         <source>Signature verified</source>
         <translation>簽章已驗證</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2435"/>
+        <location filename="../EMailViewLayout.cpp" line="139"/>
         <source>Signed by a different address</source>
         <translation>由不同地址簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2439"/>
+        <location filename="../EMailViewLayout.cpp" line="143"/>
         <source>Signature or key expired</source>
         <translation>簽章或金鑰已過期</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2443"/>
+        <location filename="../EMailViewLayout.cpp" line="147"/>
         <source>Signed by an unknown key</source>
         <translation>由未知金鑰簽署</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2447"/>
+        <location filename="../EMailViewLayout.cpp" line="151"/>
         <source>Bad signature</source>
         <translation>簽章無效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2798"/>
+        <location filename="../EMailPageView.cpp" line="2829"/>
         <source>signed, not checked</source>
         <translation>已簽署，未檢查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2803"/>
+        <location filename="../EMailPageView.cpp" line="2834"/>
         <source>signed, could not be checked</source>
         <translation>已簽署，無法檢查</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2809"/>
+        <location filename="../EMailPageView.cpp" line="2840"/>
         <source>signature not good</source>
         <translation>簽章無效</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2837"/>
+        <location filename="../EMailPageView.cpp" line="2868"/>
         <source>Some parts are outside the signed section of this message. They are not covered by the signature and could have been added by anyone.</source>
         <translation>此訊息的某些部分位於簽章區段之外。這些部分不受簽章涵蓋，可能由任何人新增。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2851"/>
         <source>1 attachment</source>
-        <translation>1 個附件</translation>
+        <translation type="vanished">1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2852"/>
         <source>%1 attachments</source>
-        <translation>%1 個附件</translation>
+        <translation type="vanished">%1 個附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2907"/>
+        <location filename="../EMailPageView.cpp" line="3041"/>
         <source>E-Mail Message (*.eml);;All Files (*)</source>
         <translation>電子郵件訊息 (*.eml);;所有檔案 (*)</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="2958"/>
+        <location filename="../EMailPageView.cpp" line="3092"/>
         <source>Cannot Send</source>
         <translation>無法傳送</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3094"/>
-        <location filename="../EMailPageView.cpp" line="3161"/>
+        <location filename="../EMailPageView.cpp" line="3213"/>
+        <location filename="../EMailPageView.cpp" line="3280"/>
         <source>Attach Files</source>
         <translation>附加檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3124"/>
+        <location filename="../EMailPageView.cpp" line="3243"/>
         <source>%1 is a folder</source>
         <translation>%1 是資料夾</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3125"/>
+        <location filename="../EMailPageView.cpp" line="3244"/>
         <source>%1 is not an ordinary file</source>
         <translation>%1 不是一般檔案</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3130"/>
+        <location filename="../EMailPageView.cpp" line="3249"/>
         <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="3136"/>
+        <location filename="../EMailPageView.cpp" line="3255"/>
         <source>%1: %2</source>
         <translation>%1：%2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3163"/>
+        <location filename="../EMailPageView.cpp" line="3282"/>
         <source>Nothing was attached:
 
 %1</source>
@@ -1974,7 +1979,7 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3164"/>
+        <location filename="../EMailPageView.cpp" line="3283"/>
         <source>These were not attached:
 
 %1</source>
@@ -1983,30 +1988,81 @@ Remove the signature and make it an ordinary message?</source>
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3230"/>
+        <location filename="../EMailPageView.cpp" line="1013"/>
+        <location filename="../EMailPageView.cpp" line="3349"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3239"/>
+        <location filename="../EMailPageView.cpp" line="829"/>
+        <source>Open, save and manage attachments</source>
+        <translation>開啟、儲存和管理附件</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="848"/>
+        <source>More</source>
+        <translation>更多</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="849"/>
+        <source>More actions for this message</source>
+        <translation>此郵件的更多操作</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="864"/>
+        <source>This message is open for inspection only. Turn it off in More.</source>
+        <translation>此郵件僅供檢查。可在「更多」中關閉。</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2912"/>
+        <source>%1 · %2 · %3</source>
+        <translation>%1 · %2 · %3</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2918"/>
+        <source>%1 files · %2</source>
+        <translation>%1 個檔案 · %2</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Collapse</source>
+        <translation>收合</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2963"/>
+        <source>Expand</source>
+        <translation>展開</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2964"/>
+        <source>Show only the summary</source>
+        <translation>僅顯示摘要</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="2965"/>
+        <source>Show every attachment</source>
+        <translation>顯示所有附件</translation>
+    </message>
+    <message>
+        <location filename="../EMailPageView.cpp" line="3358"/>
         <source>Import Key</source>
         <translation>匯入金鑰</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3243"/>
+        <location filename="../EMailPageView.cpp" line="3362"/>
         <source>Copy Name</source>
         <translation>複製名稱</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3316"/>
-        <location filename="../EMailPageView.cpp" line="3331"/>
-        <location filename="../EMailPageView.cpp" line="3346"/>
-        <location filename="../EMailPageView.cpp" line="3354"/>
+        <location filename="../EMailPageView.cpp" line="3435"/>
+        <location filename="../EMailPageView.cpp" line="3450"/>
+        <location filename="../EMailPageView.cpp" line="3465"/>
+        <location filename="../EMailPageView.cpp" line="3473"/>
         <source>Open Attachment</source>
         <translation>開啟附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3317"/>
+        <location filename="../EMailPageView.cpp" line="3436"/>
         <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>
@@ -2015,27 +2071,27 @@ Save it instead, and open it yourself if you are sure of where it came from.</so
 請改為儲存它，並在確定其來源後自行開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3332"/>
+        <location filename="../EMailPageView.cpp" line="3451"/>
         <source>A temporary folder to open %1 from could not be created.</source>
         <translation>無法建立用來開啟 %1 的暫存資料夾。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3347"/>
+        <location filename="../EMailPageView.cpp" line="3466"/>
         <source>%1 could not be written out to be opened.</source>
         <translation>無法將 %1 寫出以開啟。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3355"/>
+        <location filename="../EMailPageView.cpp" line="3474"/>
         <source>Nothing on this system is registered to open %1.</source>
         <translation>此系統上沒有註冊可開啟 %1 的程式。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3390"/>
+        <location filename="../EMailPageView.cpp" line="3504"/>
         <source>Remove Attachment</source>
         <translation>移除附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3391"/>
+        <location filename="../EMailPageView.cpp" line="3505"/>
         <source>Take out of this message:
 
 %1
@@ -2048,12 +2104,12 @@ This message came from somewhere else, so unless these have been saved already t
 此訊息來自其他地方，因此除非這些附件已儲存，否則這將是唯一的副本。移除後無法復原。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3517"/>
+        <location filename="../EMailPageView.cpp" line="3630"/>
         <source>%1 -&gt; %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3523"/>
+        <location filename="../EMailPageView.cpp" line="3636"/>
         <source>Saved. Some names were already taken in that folder, so these were written under a different name:
 
 %1</source>
@@ -2062,35 +2118,35 @@ This message came from somewhere else, so unless these have been saved already t
 %1</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3530"/>
+        <location filename="../EMailPageView.cpp" line="3643"/>
         <source>Saved 1 file.</source>
         <translation>已儲存 1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3531"/>
+        <location filename="../EMailPageView.cpp" line="3644"/>
         <source>Saved %1 files.</source>
         <translation>已儲存 %1 個檔案。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3471"/>
-        <location filename="../EMailPageView.cpp" line="3480"/>
+        <location filename="../EMailPageView.cpp" line="3584"/>
+        <location filename="../EMailPageView.cpp" line="3593"/>
         <source>Save Attachment</source>
         <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3481"/>
+        <location filename="../EMailPageView.cpp" line="3594"/>
         <source>Cannot write %1.</source>
         <translation>無法寫入 %1。</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3487"/>
-        <location filename="../EMailPageView.cpp" line="3504"/>
-        <location filename="../EMailPageView.cpp" line="3522"/>
+        <location filename="../EMailPageView.cpp" line="3600"/>
+        <location filename="../EMailPageView.cpp" line="3617"/>
+        <location filename="../EMailPageView.cpp" line="3635"/>
         <source>Save Attachments</source>
         <translation>儲存附件</translation>
     </message>
     <message>
-        <location filename="../EMailPageView.cpp" line="3505"/>
+        <location filename="../EMailPageView.cpp" line="3618"/>
         <source>Could not write: %1</source>
         <translation>無法寫入：%1</translation>
     </message>
author	saturneric <[email protected]>	2026-09-29 19:52:17 +0200
committer	saturneric <[email protected]>	2026-09-29 19:52:17 +0200
commit	0cddf993b303216d452cc9c9a9ebdb452b59f86e (patch)
tree	b740cfa630a60feed97527576ffb244c076d8b49
parent	feat(email): redesign action and attachment bars (diff)
download	modules-0cddf993b303216d452cc9c9a9ebdb452b59f86e.tar.gz modules-0cddf993b303216d452cc9c9a9ebdb452b59f86e.zip