corrected shortcut problems (Ctrl+s and co.)

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@339 34ebc366-c3a9-4b3c-9f84-69acf7962910

12 files changed, 930 insertions, 1028 deletions

diff --git a/gpgwin.cpp b/gpgwin.cpp
index 6df933f..cc643ea 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -104,13 +104,13 @@ void GpgWin::createActions()
       */
     openAct = new QAction(tr("&Open..."), this);
     openAct->setIcon(QIcon(iconPath + "fileopen.png"));
-    openAct->setShortcut(tr("Ctrl+O"));
+    openAct->setShortcut("Ctrl+O");
     openAct->setToolTip(tr("Open an existing file"));
     connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
 
     saveAct = new QAction(tr("&Save"), this);
     saveAct->setIcon(QIcon(iconPath + "filesave.png"));
-    saveAct->setShortcut(tr("Ctrl+S"));
+    saveAct->setShortcut("Ctrl+S");
     saveAct->setToolTip(tr("Save the current File"));
     connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
 
@@ -121,12 +121,12 @@ void GpgWin::createActions()
 
     printAct = new QAction(tr("&Print"), this);
     printAct->setIcon(QIcon(iconPath + "fileprint.png"));
-    printAct->setShortcut(tr("Ctrl+P"));
+    printAct->setShortcut("Ctrl+P");
     printAct->setToolTip(tr("Print Document"));
     connect(printAct, SIGNAL(triggered()), this, SLOT(print()));
 
     quitAct = new QAction(tr("&Quit"), this);
-    quitAct->setShortcut(tr("Ctrl+Q"));
+    quitAct->setShortcut("Ctrl+Q");
     quitAct->setIcon(QIcon(iconPath + "exit.png"));
     quitAct->setToolTip(tr("Quit Program"));
     connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));
@@ -135,27 +135,27 @@ void GpgWin::createActions()
      */
     pasteAct = new QAction(tr("&Paste"), this);
     pasteAct->setIcon(QIcon(iconPath + "button_paste.png"));
-    pasteAct->setShortcut(tr("Ctrl+V"));
+    pasteAct->setShortcut("Ctrl+V");
     pasteAct->setToolTip(tr("Paste Text From Clipboard"));
     connect(pasteAct, SIGNAL(triggered()), edit, SLOT(paste()));
 
     cutAct = new QAction(tr("Cu&t"), this);
     cutAct->setIcon(QIcon(iconPath + "button_cut.png"));
-    cutAct->setShortcut(tr("Ctrl+X"));
+    cutAct->setShortcut("Ctrl+X");
     cutAct->setToolTip(tr("Cut the current selection's contents to the "
                           "clipboard"));
     connect(cutAct, SIGNAL(triggered()), edit, SLOT(cut()));
 
     copyAct = new QAction(tr("&Copy"), this);
     copyAct->setIcon(QIcon(iconPath + "button_copy.png"));
-    copyAct->setShortcut(tr("Ctrl+C"));
+    copyAct->setShortcut("Ctrl+C");
     copyAct->setToolTip(tr("Copy the current selection's contents to the "
                            "clipboard"));
     connect(copyAct, SIGNAL(triggered()), edit, SLOT(copy()));
 
     selectallAct = new QAction(tr("Select &All"), this);
     selectallAct->setIcon(QIcon(iconPath + "edit.png"));
-    selectallAct->setShortcut(tr("Ctrl+A"));
+    selectallAct->setShortcut("Ctrl+A");
     selectallAct->setToolTip(tr("Select the whole text"));
     connect(selectallAct, SIGNAL(triggered()), edit, SLOT(selectAll()));
 
diff --git a/release/ts/gpg4usb_de.qm b/release/ts/gpg4usb_de.qm
index 1eeac91..df6b67a 100644
--- a/release/ts/gpg4usb_de.qm
+++ b/release/ts/gpg4usb_de.qm
diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts
index 3a26372..49c075b 100644
--- a/release/ts/gpg4usb_de.ts
+++ b/release/ts/gpg4usb_de.ts
@@ -2,52 +2,66 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="de">
 <context>
+    <name>AttachmentTableModel</name>
+    <message>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="62"/>
         <source>Add File</source>
-        <translation>Datei hinzufügen</translation>
+        <translation type="obsolete">Datei hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
         <source>Add a file</source>
-        <translation>Füge eine Datei hinzu</translation>
+        <translation type="obsolete">Füge eine Datei hinzu</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="67"/>
         <source>Encrypt</source>
-        <translation>Verschlüsseln</translation>
+        <translation type="obsolete">Verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
         <source>Encrypt marked File(s)</source>
-        <translation>Verschlüssele die markierten Dateien</translation>
+        <translation type="obsolete">Verschlüssele die markierten Dateien</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
         <source>Decrypt</source>
-        <translation>Entschlüsseln</translation>
+        <translation type="obsolete">Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
         <source>Decrypt marked File(s)</source>
-        <translation>Entschlüssele die markierten Dateien</translation>
+        <translation type="obsolete">Entschlüssele die markierten Dateien</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
         <source>couldn&apos;t open file: </source>
-        <translation>Konnte Datei nicht öffnen:</translation>
+        <translation type="obsolete">Konnte Datei nicht öffnen:</translation>
+    </message>
+    <message>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
+        <translation type="unfinished">Datei Speichern</translation>
+    </message>
+    <message>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Konnte Datei nicht schreiben %1:
@@ -130,335 +144,332 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation>Ö&amp;ffnen...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Ctrl+O</source>
-        <translation>Strg+O</translation>
+        <translation type="obsolete">Strg+O</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation>Öffen Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
         <source>Ctrl+S</source>
-        <translation>Strg+S</translation>
+        <translation type="obsolete">Strg+S</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation>Speichere Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation>Speichern &amp;unter</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
         <source>Ctrl+A</source>
-        <translation>Strg+A</translation>
+        <translation type="obsolete">Strg+A</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation>Speichere aktuelle Datei als....</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation>&amp;Drucken</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Ctrl+P</source>
-        <translation>Strg+P</translation>
+        <translation type="obsolete">Strg+P</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
         <source>Ctrl+Q</source>
-        <translation>Strg+Q</translation>
+        <translation type="obsolete">Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation>Beende das Programm</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translation>E&amp;infügen</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Ctrl+V</source>
-        <translation>Strg+V</translation>
+        <translation type="obsolete">Strg+V</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation>Füge Text aus der Zwischenablage ein</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
         <source>Ctrl+X</source>
-        <translation>Strg+X</translation>
+        <translation type="obsolete">Strg+X</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>aktuelle Auswahl ausschneiden und in Zwischenablage einfügen</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
         <source>Ctrl+C</source>
-        <translation>Strg+C</translation>
+        <translation type="obsolete">Strg+C</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>aktuelle Auswahl in Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation>Alles &amp;markieren</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation>Den ganzen Text markieren</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation>Öffne den Einstellungsdialog</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Verschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation>Verschlüssele den Text</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Entschlüsseln</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation>Entschlüssele den Text</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation>Importiere einen neuen Schlüssel aus Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation>Importiere einen neuen Schlüssel aus dem Textfeld</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation>Zeige die Information über die Anwendung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation>Ei&amp;nstellungen</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translatorcomment>Datei Verschlüsselung</translatorcomment>
         <translation>&amp;Datei Verschlüsselung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation>Ver-/Entschlüssele Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation>Schlüsselverwaltung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation>Öffne die Schlüsselverwaltung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation>Öffne den Schlüsselimport Dialog</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation>Hänge die ausgewählten Schlüssel an den Text an</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation>Hänge den gewählten Schhlüssel an den Text im Editor an</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation>Sch&amp;lüssel</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation>&amp;Importiere Schlüssel aus...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation>Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation>Verschlüssele für:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Kann Datei nicht lesen %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation>Datei geladen</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>Die Datei würde verändert. Möchten Sie die Änderung speichern?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Kann Datei nicht lesen %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translation>%1 gespeichert</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation>&lt;center&gt;Diese Anwendung ermöglicht einfaches&lt;br&gt;Ver- und Entschlüsseln von Texten und Dateien.&lt;br&gt;Sie steht unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;Falls Sie irgendwelche Fragen und/oder &lt;br&gt;Vorschläge haben, kontaktieren Sie uns über&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns einfach in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation>Öffne Datei</translation>
     </message>
@@ -467,45 +478,45 @@ Do you want to save your changes?</source>
         <translation type="obsolete">&lt;center&gt;Diese Anwendung erlaubt das einfache&lt;br&gt; Ver-und Entschlüsseln von Texten und Dateien.&lt;br&gt;Die Anwendung ist lizensiert unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Kirill (ru), Alessandro (pt)&lt;br&gt;&lt;br&gt;Falls sie Fragen oder Anregungen haben,&lt;br&gt; kontaktieren sie uns unter gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation>Konnte Datei nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation>&amp;Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation>&amp;Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation>Importiere neuen Schlüssel aus der Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation>Schlüsselimport</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation>Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation>Über</translation>
     </message>
@@ -514,17 +525,17 @@ Do you want to save your changes?</source>
         <translation type="obsolete">&lt;center&gt;Diese Anwendung ermöglicht einfaches&lt;br&gt;Ver- und Entschlüsseln von Texten und Dateien.&lt;br&gt;Sie steht unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;Falls Sie irgendwelche Fragen und/oder &lt;br&gt;Vorschläge haben, kontaktieren Sie uns über&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns einfach in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation>Schlüssel Dateien</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation>Impoertiere neuen Schlüssel aus...</translation>
     </message>
@@ -532,87 +543,87 @@ Do you want to save your changes?</source>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation>Schlüssel Details</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation>Fingerabdruck</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation>EMail-Adresse:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation>Kommentar: </translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation>Läuft ab am: </translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation>Erzeugt am: </translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation>Länge:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation>Typ: </translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation> / Nie</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation>Privaten Schlüssel exportieren</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation>Schlüsseleigenschaften</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation>Privaten Schlüssel exportieren</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
@@ -621,12 +632,12 @@ Das ist NICHT ihr öffentlicher Schlüssel,
 also geben sie ihn nicht weiter.</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation>Schlüssel In Datei exportieren</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation>Schlüsseldateien</translation>
     </message>
@@ -728,7 +739,7 @@ also geben sie ihn nicht weiter.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation>Erzeuge neuen Schlüssel</translation>
     </message>
@@ -769,7 +780,7 @@ also geben sie ihn nicht weiter.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation>Schlüssel Dateien</translation>
     </message>
@@ -779,92 +790,92 @@ also geben sie ihn nicht weiter.</translation>
         <translation>Konnte Datei nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation>Schlüssel löschen</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation>Sind Sie sicher, das sie die ausgewählten Schlüssel löschen wollen?
 Die Aktion kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation>Schlüssel exportieren</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation>E-Mailadresse:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation>Schlüsselgröße (in Bit):</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation>Ablaufdatum:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation>Passwort wiederholen:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation>läuft nie ab</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation>Passwortstärke
 Schwach -&gt; Stark</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation>Passwortstärke</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation>Name muss mindestens 5 Buchstaben lang sein.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation>Passwort und Wiederholung stimmen nicht überein.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation>Erzeuge Schlüssel...</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -938,6 +949,16 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation>
         <translation>Speichere ausgewählte private Schlüssel beim Beenden und stelle diese beim nächsten Start wieder her.</translation>
     </message>
     <message>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>save window size and position on exit</source>
         <translation type="obsolete">Speichere Fenstergröße und -position beim Beenden</translation>
     </message>
@@ -966,12 +987,12 @@ Beschleunugen(z.B. Internet-surfen, Musik hören, ...)</translation>
         <translation type="obsolete">Deutsch</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation>Systemstandard</translation>
     </message>
diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts
index 3203374..ac5f0b1 100644
--- a/release/ts/gpg4usb_en.ts
+++ b/release/ts/gpg4usb_en.ts
@@ -2,52 +2,38 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="en">
 <context>
-    <name>Attachments</name>
-    <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AttachmentTableModel</name>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -121,392 +107,357 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
-        <source>Ctrl+O</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
-        <source>Ctrl+A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
-        <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
-        <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
-        <source>Ctrl+V</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
-        <source>Ctrl+X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
-        <source>Ctrl+C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -514,99 +465,99 @@ Do you want to save your changes?</source>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -708,7 +659,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -749,7 +700,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -759,90 +710,90 @@ Make sure you keep it save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -913,6 +864,16 @@ Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Save Checked Keys</source>
         <translation type="unfinished"></translation>
@@ -933,12 +894,12 @@ Weak -&gt; Strong</source>
         <translation type="obsolete">English</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translation type="unfinished">English</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/release/ts/gpg4usb_es.qm b/release/ts/gpg4usb_es.qm
index 2888478..1bf272f 100644
--- a/release/ts/gpg4usb_es.qm
+++ b/release/ts/gpg4usb_es.qm
diff --git a/release/ts/gpg4usb_es.ts b/release/ts/gpg4usb_es.ts
index 8615a16..e685dc4 100644
--- a/release/ts/gpg4usb_es.ts
+++ b/release/ts/gpg4usb_es.ts
@@ -2,52 +2,42 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="es_ES">
 <context>
-    <name>Attachments</name>
-    <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AttachmentTableModel</name>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
-        <translation type="unfinished"></translation>
+        <source>couldn&apos;t open file: </source>
+        <translation type="obsolete">no se pudo abrir el archivo:</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
+        <translation type="unfinished">Guardar Archivo</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
-        <translation type="unfinished">no se pudo abrir el archivo:</translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation type="unfinished">Archivo</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -122,370 +112,367 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation>&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Ctrl+O</source>
-        <translation>Crtl+O</translation>
+        <translation type="obsolete">Crtl+O</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation>Abrir un archivo existente</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation>&amp;Guardar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
         <source>Ctrl+S</source>
-        <translation>Crtl+S</translation>
+        <translation type="obsolete">Crtl+S</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation>Guardar el archivo actual</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation>Guardar &amp;Como</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation>Guardar el Archivo actual como...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Ctrl+P</source>
-        <translation>Crtl+P</translation>
+        <translation type="obsolete">Crtl+P</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation>Imprimir Documento</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
         <source>Ctrl+Q</source>
-        <translation>Crtl+Q</translation>
+        <translation type="obsolete">Crtl+Q</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation>Salir del Programa</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translation>&amp;Pegar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Ctrl+V</source>
-        <translation>Crtl+V</translation>
+        <translation type="obsolete">Crtl+V</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation>Pegar Texto desde Portapapeles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translation>Corta&amp;r</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
         <source>Ctrl+X</source>
-        <translation>Crtl+X</translation>
+        <translation type="obsolete">Crtl+X</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Cortar contenido seleccion actual al portapapeles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
         <source>Ctrl+C</source>
-        <translation>Crtl+C</translation>
+        <translation type="obsolete">Crtl+C</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copiar contenido seleccion actual al portapapeles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation>Seleccionar &amp;Todo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
         <source>Ctrl+A</source>
-        <translation>Crtl+A</translation>
+        <translation type="obsolete">Crtl+A</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation>Seleccionar todo el texto</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation>Con&amp;figuracion</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation>Abrir dialogo configuracion</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Cifrar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation>Crtl+E</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation>Cifrar Mensaje</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Descifrar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation>Crtl+D</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation>Descifrar Mensaje</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translation>&amp;Cifrado Archivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation>Cifrar / Descifrar Archivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation>Importar Nueva Llave Desde Archivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation>&amp;Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation>Importar Nueva Llave Desde Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation>&amp;Portapapeles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation>Importar Nueva Llave Desde Portapapeles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation>Administar Llaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation>Abrir Administrar Llaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation>Importar Llave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation>Abrir Dialogo Importar Nueva Llave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation>Mostrar caja Acerca de programa</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation>Adjuntar Llave(s) Seleccionadas Al Texto</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation>Adjuntar Llaves Seleccionadas Al Texto en Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Cifrar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation>&amp;Llaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation>&amp;Importar Llave Desde...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation>Cifrar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation>Llave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation>Listo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation>Cifrar para:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation>Programa</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>No puedo leer archivo %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation>Archivo cargado</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation>%1[*] - %2</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>El documento ha sido modificado.
 Quiere usted guardar los cambios?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>No puedo escribir archivo %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translation>Guardado &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation>Acerca de&apos;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -494,27 +481,27 @@ Quiere usted guardar los cambios?</translation>
         <translation type="obsolete">&lt;center&gt;Este Programa le permite hacer un facil&lt;br&gt;cifrado/descifrado de sus mensajes de texto o archivos.&lt;br&gt;Esta licenciado bajo el GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Programadores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Traduccion:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato13 (es)&lt;br&gt;&lt;br&gt;Si usted tiene alguna pregunta y/ o &lt;br&gt;sugerencia, contacte con nosotros en&lt;br&gt;gpg4usb en cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;o puede encontrarnos en nuestro xmpp-channel:&lt;br&gt;gpg4usb en conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation>Abrir Llave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation>Archivos de Llaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation>Todos Archivos</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation>no se pudo abrir el archivo:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation>Importar Llave Desde...</translation>
     </message>
@@ -522,87 +509,87 @@ Quiere usted guardar los cambios?</translation>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation>Detalles del Propietario</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation>Detalles de la Llave</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation>Huella Digital</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation>Direccion de E-Mail:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation>Tamaño Llave:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation>Expira en:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation>Creada en:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation>Algoritmo:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation> / Nunca</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation>Llave Privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation>Exportar llave Privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation>Detalles Llave</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation>Exportando Llave privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
@@ -611,12 +598,12 @@ Esta NO es su llave publica, asi que no la regale.
 Guardela de forma segura.</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation>Exportar Llave a Archivo</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation>Archivos Llaves</translation>
     </message>
@@ -718,7 +705,7 @@ Guardela de forma segura.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation>Crear Llave</translation>
     </message>
@@ -759,7 +746,7 @@ Guardela de forma segura.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation>Archivos Llave</translation>
     </message>
@@ -769,93 +756,93 @@ Guardela de forma segura.</translation>
         <translation>No pude Abrir el Archivo:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation>Borrando Llaves</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation>Esta seguro de querer borrar las llaves seleccionadas?.
 Esta accion no se puede deshacer.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation>Exportar Llave A Archivo</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation>Direccion E-mail:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation>Tamaño Llave (en Bit):</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation>Fecha Expiracion:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation>Repetir Password:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation>Nunca Expira</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation>Password: Fortaleza
 Debil -&gt; Fuerte</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation>Fortaleza Password</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation>El nombre debe contener al menos cinco caracteres. 
 </translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation>  Password y Repeticion no coinciden.  </translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation>Creando Llave...</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -948,12 +935,22 @@ Para acelerar el proceso use su computador
         <translation>Cambio idioma se aplica despues de reiniciar el programa.</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation>Por Defecto</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translation>Español</translation>
     </message>
diff --git a/release/ts/gpg4usb_fr.qm b/release/ts/gpg4usb_fr.qm
index ca98ec8..fb4c7cd 100644
--- a/release/ts/gpg4usb_fr.qm
+++ b/release/ts/gpg4usb_fr.qm
diff --git a/release/ts/gpg4usb_fr.ts b/release/ts/gpg4usb_fr.ts
index d6c4172..b19d6ca 100644
--- a/release/ts/gpg4usb_fr.ts
+++ b/release/ts/gpg4usb_fr.ts
@@ -2,52 +2,42 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="fr_FR">
 <context>
-    <name>Attachments</name>
+    <name>AttachmentTableModel</name>
     <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
-        <translation type="unfinished"></translation>
+        <source>couldn&apos;t open file: </source>
+        <translation type="obsolete">Fichier non-ouvrable:</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
+        <translation type="unfinished">Enregistrer fichier</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
-        <translation type="unfinished">Fichier non-ouvrable:</translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation type="unfinished">Fichier</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -129,369 +119,334 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
-        <source>Ctrl+O</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation>Ouvrir un fichier existant</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
-        <source>Ctrl+S</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation>Enregistrer le fichier en cours</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation>Enregistrer &amp;sous</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation>Enregistrer  le fichier en cours sous...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimer</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
-        <source>Ctrl+P</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation>Imprimer fichier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
-        <source>Ctrl+Q</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation>Fermer programme</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translation>&amp;Coller</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
-        <source>Ctrl+V</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation>Coller depuis le presse-papiers</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translation>Cou&amp;per</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
-        <source>Ctrl+X</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Couper et ajouter dans le presse papiers</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
-        <source>Ctrl+C</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copier et ajouter dans le presse papiers</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation>Selectionner &amp;tout</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
-        <source>Ctrl+A</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation>Selectionner tout le texte</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Crypter</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation>Crypter message</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Decrypter</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation>Decrypter message</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translation>Cryptage du &amp;fichier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation>Crypter/Decrypter fichier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translatorcomment>&amp;Fichier</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation>Importer nouvelle cle depuis le fichier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation>&amp;Editeur</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation>Importer nouvelle cle depuis l&apos;editeur</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation>&amp;Presse papiers</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation>Importer nouvelle cle depuis le presse papiers</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation>gestion des cles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation>Ouvrir le gestionaire des cles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation>Importer cles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation>Ouvrir la fenetre d&apos;import de nouvelle cle</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation type="unfinished">Crypt-Toolbar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation>&amp;A propos</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation>Afficher la fenetre d&apos;information</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation>joindre les cles selectionees au texte</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation>joindre les cles selectionees au texte dans l&apos;editeur</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translatorcomment>bla</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Crypter</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation>&amp;Cles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation>&amp;Importer une cle depuis...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>Le document a ete modifie. Voulez-vous enregistrer les modifications?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Fichier protege en ecriture %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translation>Fichiers enregistres &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation>A propos </translation>
     </message>
@@ -500,27 +455,27 @@ Do you want to save your changes?</source>
         <translation type="obsolete">&lt;center&gt;Cette application vous permet de crypter ou decrypter&lt;br&gt; simplement votre texte-message ou fichier.&lt;br&gt; Logiciel libre v2.0&lt;br&gt; &lt;b&gt;Developpeurs:&lt;/b&gt;  Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;  Traduction:&lt;/b&gt;&lt;br&gt;Kirill (ru), Axel (fr)&lt;br&gt;&lt;br&gt;  Si vous avez questions ou propositions, &lt;br&gt;contactez nous sur notre email &lt;br&gt;gpgusb at cpunk.de&lt;/a&gt; ou par xmpp-chat &lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation type="unfinished">Fichiers des cles</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation type="unfinished">Fichier non-ouvrable:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -528,99 +483,99 @@ Do you want to save your changes?</source>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation>Proprietes de la cle</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation>Empreinte</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation>nom:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation>Commentaire:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation>Taille:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation>Expiration:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation>Creation:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation>Algorithme:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation>/ Jamais</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation>Cle privee</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation>Exporter la cle publique</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation>Proprietes de la cle</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation>Exporter la cle publique</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation type="unfinished">Exporter des cles a fichier</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation type="unfinished"></translation>
     </message>
@@ -722,7 +677,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation>Generer une paire des cles</translation>
     </message>
@@ -763,7 +718,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation type="unfinished">Fichiers des cles</translation>
     </message>
@@ -773,90 +728,90 @@ Make sure you keep it save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation type="unfinished">Supprimer des cles</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation type="unfinished">Exporter des cles a fichier</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation>Commentaire:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation>Taille:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation>Expiration:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation>Mot de passe:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation type="unfinished">Emploi de le mot de passe:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation type="unfinished">Expire jamais</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -927,6 +882,16 @@ Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../../settingsdialog.cpp" line="97"/>
         <source>Save Checked Keys</source>
         <translation type="unfinished"></translation>
@@ -947,12 +912,12 @@ Weak -&gt; Strong</source>
         <translation type="obsolete">Français</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translation>Français</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/release/ts/gpg4usb_pt_BR.qm b/release/ts/gpg4usb_pt_BR.qm
index 67fa05d..a0cee1b 100644
--- a/release/ts/gpg4usb_pt_BR.qm
+++ b/release/ts/gpg4usb_pt_BR.qm
diff --git a/release/ts/gpg4usb_pt_BR.ts b/release/ts/gpg4usb_pt_BR.ts
index 39b3ed0..6e860e5 100644
--- a/release/ts/gpg4usb_pt_BR.ts
+++ b/release/ts/gpg4usb_pt_BR.ts
@@ -2,52 +2,38 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="pt_BR">
 <context>
-    <name>Attachments</name>
-    <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AttachmentTableModel</name>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
+        <translation type="unfinished">Salvar Arquivo</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation type="unfinished">Arquivo</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -130,219 +116,211 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation>&amp;Abrir...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Ctrl+O</source>
-        <translation>Ctrl+A</translation>
+        <translation type="obsolete">Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation>Abrir um arquivo existente</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation>Salvar o arquivo atual</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation>Salvar Co&amp;mo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
         <source>Ctrl+A</source>
-        <translation>Ctrl+M</translation>
+        <translation type="obsolete">Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation>Salvar o arquivo atual como...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Ctrl+P</source>
-        <translation>Ctrl+I</translation>
+        <translation type="obsolete">Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation>Imprimir Documento</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation>Sai&amp;r</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
         <source>Ctrl+Q</source>
-        <translation>Ctrl+R</translation>
+        <translation type="obsolete">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translatorcomment>i used this without accelerator &amp; to avoid confusion with windows native paste (ctrl+v)</translatorcomment>
         <translation>Colar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Ctrl+V</source>
-        <translation>Ctrl+V</translation>
+        <translation type="obsolete">Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation>Colar Texto da Área de Transferência</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translatorcomment>i used this without accelerator &amp; to avoid confusion with native windows cut ctrl+x</translatorcomment>
         <translation>Recortar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
         <source>Ctrl+X</source>
-        <translation>Ctrl+X</translation>
+        <translation type="obsolete">Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Recortar a seleção atual para a Área de Transferência</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation>&amp;Copiar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
         <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+        <translation type="obsolete">Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Copiar a seleção para a área de transferência</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation>Selecionar &amp;Tudo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation>Selecionar o texto completo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation>Con&amp;figurações</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation>Abre janela de configurações</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation>&amp;Encriptar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation>Encriptar Mensagem</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation>&amp;Decriptar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation>Decriptar Mensagem</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translation>Encriptar &amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation>Encriptar/Decriptar Arquivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation>Importar Nova Chave do Arquivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation>Importar Nova Chave do Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation>Gerenciar Chaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation>Abrir Gerenciador de Chaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation>Abrir Diálogo de Importação de Nova Chave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation>Exibe a caixa &apos;sobre&apos;</translation>
     </message>
@@ -351,110 +329,115 @@
         <translation type="obsolete">&lt;center&gt;Esse programa serve para encriptar e&lt;br&gt;decriptar mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob a licença GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões,&lt;br&gt;envie uma mensagem para&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou nos encontre no nosso canal xmpp:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translation>&amp;Arquivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translation>E&amp;ditar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation>A&amp;juda</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation>Anexar Chaves Marcadas no Texto</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation>Anexar Chaves Marcadas no Texto do Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation>&amp;Chaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation>E&amp;xibir</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation>Chave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation>Pronto</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation>Encriptar para:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Não leu o arquivo %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation>Arquivo carregado</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation>%1[*] - %2</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>O documento foi alterado.
 Deseja salvar as alterações?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Não escreveu o arquivo %1: %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translatorcomment>i used inverse order because its more natural speak in this way</translatorcomment>
         <translation>&apos;%1&apos; salvo.</translation>
@@ -464,70 +447,70 @@ Deseja salvar as alterações?</translation>
         <translation type="obsolete">&lt;center&gt; Este aplicativo permite a encriptação/decriptação&lt;br&gt;simplificada das suas mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob licença GPL-V2.0&lt;br&gt;&lt;br&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Krill(ru)&lt;br&gt;Alessandro Benevenuto (pt-br)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões, entre em&lt;br&gt;contatoatravés de gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou no canal xmpp&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation>Abrir a Chave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation>Arquivos de Chaves</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation>Todos os Arquivos</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation>Não pode abrir o arquivo:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation>&amp;Editor</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation>Área de &amp;Transferência</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation>Importar Nova Chave da Área de Transferência</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation>Importar Chave</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Encriptar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation>Encriptar</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation>Importar Chave de...</translation>
     </message>
@@ -535,92 +518,92 @@ Deseja salvar as alterações?</translation>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation>Detalhes do Proprietario</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation>Detalhes da chave</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation>Assinatura digital</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation>Endereço de E-Mail:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation>Comentários:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation>Expira em:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation>Criada em:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation>Detalhes da chave</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation>Arquivos de Chaves</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation>Tamanho da chave:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation>Algorítmo:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation>/Nunca</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation>Chave Privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation>Exportar Chave Privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation>Exportando Chave Privada</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
@@ -629,7 +612,7 @@ Essa NÃO é sua chave pública, portanto NÃO a distribua.
 Guarde-a em segurança.</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation>Exportar Chave para Arquivo</translation>
     </message>
@@ -731,7 +714,7 @@ Guarde-a em segurança.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation>Gerar Chave</translation>
     </message>
@@ -772,7 +755,7 @@ Guarde-a em segurança.</translation>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation>Arquivos de Chaves</translation>
     </message>
@@ -782,91 +765,91 @@ Guarde-a em segurança.</translation>
         <translation>Não Pode Abrir o Arquivo:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation>Exluindo as Chaves</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation>Tem certeza que deseja excluir as chaves marcadas?
 A ação não poderá ser desfeita.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation>Exportar Chave para Arquivo</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation>E-mail:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation>Comentários:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation>Tamanho da Chave (bits):</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation>Data de expiração:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation>Repetir a Senha:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation>Nunca Expira</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation>Força da Senha: Fraca -&gt; Forte</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation>Força da Senha</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation>  o nome deve conter pelo menos cinco caracteres.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation>As senhas não conferem.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation>Gerando as Chaves...</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -940,6 +923,16 @@ Para agilizar o processo use seu computador
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>save window size and position on exit</source>
         <translation type="obsolete">Salvar posição e tamanho  da janela ao sair</translation>
     </message>
@@ -964,12 +957,12 @@ Para agilizar o processo use seu computador
         <translation type="obsolete">Português do Brasil</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translation>Português do Brasil</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation>Padrão do Sistema</translation>
     </message>
diff --git a/release/ts/gpg4usb_ru.qm b/release/ts/gpg4usb_ru.qm
index ec458b1..586f244 100644
--- a/release/ts/gpg4usb_ru.qm
+++ b/release/ts/gpg4usb_ru.qm
diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts
index 97cca94..dd9cc48 100644
--- a/release/ts/gpg4usb_ru.ts
+++ b/release/ts/gpg4usb_ru.ts
@@ -2,52 +2,42 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="ru">
 <context>
-    <name>Attachments</name>
+    <name>AttachmentTableModel</name>
     <message>
-        <location filename="../../attachments.cpp" line="62"/>
-        <source>Add File</source>
+        <location filename="../../attachmenttablemodel.cpp" line="113"/>
+        <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="63"/>
-        <source>Add a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="67"/>
-        <source>Encrypt</source>
+        <location filename="../../attachmenttablemodel.cpp" line="116"/>
+        <source>Contenttype</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Attachments</name>
     <message>
-        <location filename="../../attachments.cpp" line="68"/>
-        <source>Encrypt marked File(s)</source>
-        <translation type="unfinished"></translation>
+        <source>couldn&apos;t open file: </source>
+        <translation type="obsolete">Не удалось открыть файл: </translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="72"/>
-        <source>Decrypt</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../attachments.cpp" line="76"/>
+        <location filename="../../attachments.cpp" line="104"/>
+        <source>Save File</source>
+        <translation type="unfinished">Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="73"/>
-        <source>Decrypt marked File(s)</source>
+        <location filename="../../attachments.cpp" line="77"/>
+        <source>Save this file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="104"/>
-        <location filename="../../attachments.cpp" line="143"/>
-        <source>couldn&apos;t open file: </source>
-        <translation type="unfinished">Не удалось открыть файл: </translation>
-    </message>
-    <message>
-        <location filename="../../attachments.cpp" line="121"/>
-        <location filename="../../attachments.cpp" line="158"/>
+        <location filename="../../attachments.cpp" line="110"/>
         <source>File</source>
         <translation type="unfinished">Файл</translation>
     </message>
     <message>
-        <location filename="../../attachments.cpp" line="122"/>
-        <location filename="../../attachments.cpp" line="159"/>
+        <location filename="../../attachments.cpp" line="111"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
@@ -130,395 +120,360 @@
 <context>
     <name>GpgWin</name>
     <message>
-        <location filename="../../gpgwin.cpp" line="112"/>
+        <location filename="../../gpgwin.cpp" line="105"/>
         <source>&amp;Open...</source>
         <translation>&amp;Открыть...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="114"/>
-        <source>Ctrl+O</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="115"/>
+        <location filename="../../gpgwin.cpp" line="108"/>
         <source>Open an existing file</source>
         <translation>Открать существующий файл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="118"/>
+        <location filename="../../gpgwin.cpp" line="111"/>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="120"/>
-        <source>Ctrl+S</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="121"/>
+        <location filename="../../gpgwin.cpp" line="114"/>
         <source>Save the current File</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="124"/>
+        <location filename="../../gpgwin.cpp" line="117"/>
         <source>Save &amp;As</source>
         <translation>Сохранить &amp;как</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="165"/>
-        <source>Ctrl+A</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="126"/>
+        <location filename="../../gpgwin.cpp" line="119"/>
         <source>Save the current File as...</source>
         <translation>Сохранить файл как...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="129"/>
+        <location filename="../../gpgwin.cpp" line="122"/>
         <source>&amp;Print</source>
         <translation>&amp;Печать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="131"/>
-        <source>Ctrl+P</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="132"/>
+        <location filename="../../gpgwin.cpp" line="125"/>
         <source>Print Document</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="135"/>
+        <location filename="../../gpgwin.cpp" line="128"/>
         <source>&amp;Quit</source>
         <translation>Вы&amp;йти</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="136"/>
-        <source>Ctrl+Q</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="138"/>
+        <location filename="../../gpgwin.cpp" line="131"/>
         <source>Quit Program</source>
         <translation>Завершить программу</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="143"/>
+        <location filename="../../gpgwin.cpp" line="136"/>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="145"/>
-        <source>Ctrl+V</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="146"/>
+        <location filename="../../gpgwin.cpp" line="139"/>
         <source>Paste Text From Clipboard</source>
         <translation>Вставить текст из Буфера Обмена</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="149"/>
+        <location filename="../../gpgwin.cpp" line="142"/>
         <source>Cu&amp;t</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="151"/>
-        <source>Ctrl+X</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="152"/>
+        <location filename="../../gpgwin.cpp" line="145"/>
         <source>Cut the current selection&apos;s contents to the clipboard</source>
         <translation>Вырезать выделенные элементы в Буфер Обмена</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="156"/>
+        <location filename="../../gpgwin.cpp" line="149"/>
         <source>&amp;Copy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="158"/>
-        <source>Ctrl+C</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../gpgwin.cpp" line="159"/>
+        <location filename="../../gpgwin.cpp" line="152"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation>Копировать выделенные элементы в Буфер Обмена</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="163"/>
+        <location filename="../../gpgwin.cpp" line="156"/>
         <source>Select &amp;All</source>
         <translation>В&amp;ыделить всё</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="166"/>
+        <location filename="../../gpgwin.cpp" line="159"/>
         <source>Select the whole text</source>
         <translation>Выделить весь текст</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="170"/>
+        <location filename="../../gpgwin.cpp" line="163"/>
         <source>Open settings dialog</source>
         <translation>Открыть окно настроек</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="175"/>
+        <location filename="../../gpgwin.cpp" line="168"/>
         <source>&amp;Encrypt</source>
         <translation>З&amp;ашифровать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="177"/>
+        <location filename="../../gpgwin.cpp" line="170"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="178"/>
+        <location filename="../../gpgwin.cpp" line="171"/>
         <source>Encrypt Message</source>
         <translation>Зашифровать текст</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="181"/>
+        <location filename="../../gpgwin.cpp" line="174"/>
         <source>&amp;Decrypt</source>
         <translation>Расшифро&amp;вать</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="183"/>
+        <location filename="../../gpgwin.cpp" line="176"/>
         <source>Ctrl+D</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="184"/>
+        <location filename="../../gpgwin.cpp" line="177"/>
         <source>Decrypt Message</source>
         <translation>Расшифровать текст</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="196"/>
+        <location filename="../../gpgwin.cpp" line="189"/>
         <source>Import New Key From File</source>
         <translation>Импорт нового ключа из файла</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="201"/>
+        <location filename="../../gpgwin.cpp" line="194"/>
         <source>Import New Key From Editor</source>
         <translation>Импорт нового ключа из редактора</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="221"/>
+        <location filename="../../gpgwin.cpp" line="214"/>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="223"/>
+        <location filename="../../gpgwin.cpp" line="216"/>
         <source>Show the application&apos;s About box</source>
         <translation>Показать инфо о программе</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="194"/>
-        <location filename="../../gpgwin.cpp" line="235"/>
-        <location filename="../../gpgwin.cpp" line="572"/>
+        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="614"/>
         <source>&amp;File</source>
         <translation>Ф&amp;айл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="243"/>
+        <location filename="../../gpgwin.cpp" line="236"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="266"/>
+        <location filename="../../gpgwin.cpp" line="259"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="435"/>
+        <location filename="../../gpgwin.cpp" line="432"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="283"/>
+        <location filename="../../gpgwin.cpp" line="276"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="169"/>
+        <location filename="../../gpgwin.cpp" line="162"/>
         <source>Se&amp;ttings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="187"/>
+        <location filename="../../gpgwin.cpp" line="180"/>
         <source>&amp;File Encryption</source>
         <translation>Шифрование &amp;файлов</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="189"/>
+        <location filename="../../gpgwin.cpp" line="182"/>
         <source>Encrypt/Decrypt File</source>
         <translation>За-/Расшифровать файл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="209"/>
+        <location filename="../../gpgwin.cpp" line="202"/>
         <source>Key Management</source>
         <translation>Менеджер ключей</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="211"/>
+        <location filename="../../gpgwin.cpp" line="204"/>
         <source>Open Keymanagement</source>
         <translation>Открыть Менеджер ключей</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="216"/>
+        <location filename="../../gpgwin.cpp" line="209"/>
         <source>Open Import New Key Dialog</source>
         <translation>Открыть окно импорта ключей</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="228"/>
+        <location filename="../../gpgwin.cpp" line="221"/>
         <source>Append Selected Key(s) To Text</source>
         <translation>Добавить выбранн. ключ(и) к тексту</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="229"/>
+        <location filename="../../gpgwin.cpp" line="222"/>
         <source>Append The Selected Keys To Text in Editor</source>
         <translation>Добавить выбранный ключ к тексту в редакторе</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="256"/>
+        <location filename="../../gpgwin.cpp" line="249"/>
         <source>&amp;Keys</source>
         <translation>&amp;Ключи</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="257"/>
+        <location filename="../../gpgwin.cpp" line="250"/>
         <source>&amp;Import Key From...</source>
         <translation>&amp;Импорт ключа из...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="264"/>
+        <location filename="../../gpgwin.cpp" line="257"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="278"/>
+        <location filename="../../gpgwin.cpp" line="271"/>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="292"/>
-        <location filename="../../gpgwin.cpp" line="461"/>
+        <location filename="../../gpgwin.cpp" line="285"/>
+        <location filename="../../gpgwin.cpp" line="458"/>
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="299"/>
+        <location filename="../../gpgwin.cpp" line="292"/>
         <source>Encrypt for:</source>
         <translation>   Зашифровать для:</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="380"/>
-        <location filename="../../gpgwin.cpp" line="420"/>
+        <location filename="../../gpgwin.cpp" line="300"/>
+        <source>Attached files:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../gpgwin.cpp" line="377"/>
+        <location filename="../../gpgwin.cpp" line="417"/>
         <source>Application</source>
         <translation>Приложение</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="381"/>
+        <location filename="../../gpgwin.cpp" line="378"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation>Не удалось прочесть файл %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="393"/>
+        <location filename="../../gpgwin.cpp" line="390"/>
         <source>File loaded</source>
         <translation>Файл загружен</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="408"/>
+        <location filename="../../gpgwin.cpp" line="405"/>
         <source>%1[*] - %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="421"/>
+        <location filename="../../gpgwin.cpp" line="418"/>
         <source>The document has been modified.
 Do you want to save your changes?</source>
         <translation>Документ был редактирован.
 Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="436"/>
+        <location filename="../../gpgwin.cpp" line="433"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Не удалось записать файл %1:
 %2.</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="445"/>
+        <location filename="../../gpgwin.cpp" line="442"/>
         <source>Saved &apos;%1&apos;</source>
         <translation>&quot;%1&quot; сохранён</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="470"/>
+        <location filename="../../gpgwin.cpp" line="467"/>
         <source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Open Key</source>
         <translation>Открыть ключ</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="539"/>
+        <location filename="../../gpgwin.cpp" line="581"/>
         <source>couldn&apos;t open file: </source>
         <translation>Не удалось открыть файл: </translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="199"/>
-        <location filename="../../gpgwin.cpp" line="573"/>
+        <location filename="../../gpgwin.cpp" line="192"/>
+        <location filename="../../gpgwin.cpp" line="615"/>
         <source>&amp;Editor</source>
         <translation>Окна &amp;редактора</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="204"/>
-        <location filename="../../gpgwin.cpp" line="574"/>
+        <location filename="../../gpgwin.cpp" line="197"/>
+        <location filename="../../gpgwin.cpp" line="616"/>
         <source>&amp;Clipboard</source>
         <translation>&amp;Буфера Обмена</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="206"/>
+        <location filename="../../gpgwin.cpp" line="199"/>
         <source>Import New Key From Clipboard</source>
         <translation>Импорт нового ключа из Буфера Обмена</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="214"/>
-        <location filename="../../gpgwin.cpp" line="563"/>
+        <location filename="../../gpgwin.cpp" line="207"/>
+        <location filename="../../gpgwin.cpp" line="605"/>
         <source>Import Key</source>
         <translation>Импорт ключа</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="250"/>
+        <location filename="../../gpgwin.cpp" line="243"/>
         <source>&amp;Crypt</source>
         <translation>&amp;Шифрование</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="272"/>
+        <location filename="../../gpgwin.cpp" line="265"/>
         <source>Crypt</source>
         <translation>Шифрование</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="467"/>
+        <location filename="../../gpgwin.cpp" line="464"/>
         <source>About </source>
         <translation>О программе </translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>Key Files</source>
         <translation>Файлы ключей</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="535"/>
+        <location filename="../../gpgwin.cpp" line="577"/>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="571"/>
+        <location filename="../../gpgwin.cpp" line="613"/>
         <source>Import Key From...</source>
         <translation>Импорт ключа из...</translation>
     </message>
@@ -526,92 +481,92 @@ Do you want to save your changes?</source>
 <context>
     <name>KeyDetailsDialog</name>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="30"/>
+        <location filename="../../keydetailsdialog.cpp" line="31"/>
         <source>Owner details</source>
         <translation>Свойства владельца</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="31"/>
+        <location filename="../../keydetailsdialog.cpp" line="32"/>
         <source>Key details</source>
         <translation>Свойства ключа</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="32"/>
+        <location filename="../../keydetailsdialog.cpp" line="33"/>
         <source>Fingerprint</source>
         <translation>Отпечаток</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="36"/>
+        <location filename="../../keydetailsdialog.cpp" line="37"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="37"/>
+        <location filename="../../keydetailsdialog.cpp" line="38"/>
         <source>E-Mailaddress:</source>
         <translation>Адрес eMail:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="38"/>
+        <location filename="../../keydetailsdialog.cpp" line="39"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="40"/>
+        <location filename="../../keydetailsdialog.cpp" line="41"/>
         <source>Expires on: </source>
         <translation>Истекает:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="41"/>
+        <location filename="../../keydetailsdialog.cpp" line="42"/>
         <source>Created on: </source>
         <translation>Создан:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="128"/>
+        <location filename="../../keydetailsdialog.cpp" line="129"/>
         <source>Keydetails</source>
         <translation>Свойства ключа</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Key Files </source>
         <translation>Файлы ключей</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="39"/>
+        <location filename="../../keydetailsdialog.cpp" line="40"/>
         <source>Key size:</source>
         <translation>Длина ключа:</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="42"/>
+        <location filename="../../keydetailsdialog.cpp" line="43"/>
         <source>Algorithm: </source>
         <translation>Алгоритм: </translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="51"/>
+        <location filename="../../keydetailsdialog.cpp" line="52"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="63"/>
+        <location filename="../../keydetailsdialog.cpp" line="64"/>
         <source> / Never</source>
         <translation> / Никогда</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="114"/>
+        <location filename="../../keydetailsdialog.cpp" line="115"/>
         <source>Private Key</source>
         <translation>Секретный ключ</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="117"/>
+        <location filename="../../keydetailsdialog.cpp" line="118"/>
         <source>Export Private Key</source>
         <translation>Экспортировать Секретный ключ</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="136"/>
+        <location filename="../../keydetailsdialog.cpp" line="138"/>
         <source>Exporting private Key</source>
         <translation>Экспорт Секретного ключа</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="137"/>
+        <location filename="../../keydetailsdialog.cpp" line="139"/>
         <source>You are about to export your private key.
 This is NOT your public key, so don&apos;t give it away.
 Make sure you keep it save.</source>
@@ -620,7 +575,7 @@ Make sure you keep it save.</source>
 Убедитесь, что он хранится в Надёжном Месте.</translation>
     </message>
     <message>
-        <location filename="../../keydetailsdialog.cpp" line="147"/>
+        <location filename="../../keydetailsdialog.cpp" line="149"/>
         <source>Export Key To File</source>
         <translation>Экспорт ключа в файл</translation>
     </message>
@@ -722,7 +677,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="107"/>
-        <location filename="../../keymgmt.cpp" line="235"/>
+        <location filename="../../keymgmt.cpp" line="236"/>
         <source>Generate Key</source>
         <translation>Генерировать ключ</translation>
     </message>
@@ -763,7 +718,7 @@ Make sure you keep it save.</source>
     </message>
     <message>
         <location filename="../../keymgmt.cpp" line="148"/>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Key Files</source>
         <translation>Файлы ключей</translation>
     </message>
@@ -773,93 +728,93 @@ Make sure you keep it save.</source>
         <translation>Не удалось открыть файл: </translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="184"/>
+        <location filename="../../keymgmt.cpp" line="185"/>
         <source>Deleting Keys</source>
         <translation>Удаление ключа</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="185"/>
+        <location filename="../../keymgmt.cpp" line="186"/>
         <source>Are you sure that you want to delete the selected keys?.
 The action can not be undone.</source>
         <translation>Вы уверены, что хотите стереть выбранные ключи?
 Это действие будет необратимым.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="208"/>
+        <location filename="../../keymgmt.cpp" line="209"/>
         <source>Export Key To File</source>
         <translation>Экспорт ключа в файл</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="238"/>
+        <location filename="../../keymgmt.cpp" line="239"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="239"/>
+        <location filename="../../keymgmt.cpp" line="240"/>
         <source>E-Mailaddress::</source>
         <translation>Адрес eMail:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="240"/>
+        <location filename="../../keymgmt.cpp" line="241"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="241"/>
+        <location filename="../../keymgmt.cpp" line="242"/>
         <source>KeySize (in Bit):</source>
         <translation>Длина ключа (бит):</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="242"/>
+        <location filename="../../keymgmt.cpp" line="243"/>
         <source>Expiration Date:</source>
         <translation>Истекает:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="243"/>
+        <location filename="../../keymgmt.cpp" line="244"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="244"/>
+        <location filename="../../keymgmt.cpp" line="245"/>
         <source>Repeat Password:</source>
         <translation>Повторите Пароль:</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="245"/>
+        <location filename="../../keymgmt.cpp" line="246"/>
         <source>Never Expire</source>
         <translation>без срока годности</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="246"/>
+        <location filename="../../keymgmt.cpp" line="247"/>
         <source>Password: Strength
 Weak -&gt; Strong</source>
         <translation>Надёжность Пароля
 Слабый -&gt; Стойкий</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="277"/>
+        <location filename="../../keymgmt.cpp" line="278"/>
         <source>Password Strength</source>
         <translation>Надёжность Пароля</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="331"/>
+        <location filename="../../keymgmt.cpp" line="332"/>
         <source>  Name must contain at least five characters.  
 </source>
         <translation>  Имя должно быть длиной не менее 5 букв.  
 </translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="334"/>
+        <location filename="../../keymgmt.cpp" line="335"/>
         <source>  Password and Repeat don&apos;t match.  </source>
         <translation>Повторно введённый Пароль не совпал.</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="373"/>
+        <location filename="../../keymgmt.cpp" line="374"/>
         <source>Generating Key...</source>
         <translation>Генерация ключа...</translation>
     </message>
     <message>
-        <location filename="../../keymgmt.cpp" line="375"/>
+        <location filename="../../keymgmt.cpp" line="376"/>
         <source>Collecting random data for key generation.
  This may take a while.
  To speed up the process use your computer
@@ -933,6 +888,16 @@ Weak -&gt; Strong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../../settingsdialog.cpp" line="124"/>
+        <source>MIME-parsing (Experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../settingsdialog.cpp" line="126"/>
+        <source>Try to split attachments from PGP-MIME ecrypted messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>save window size and position on exit</source>
         <translation type="obsolete">Сохранять размер окна при выходе</translation>
     </message>
@@ -958,13 +923,13 @@ Weak -&gt; Strong</source>
         <translation type="obsolete">Русский</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="245"/>
+        <location filename="../../settingsdialog.cpp" line="258"/>
         <source>English</source>
         <translatorcomment>Also local language here?</translatorcomment>
         <translation>Русский</translation>
     </message>
     <message>
-        <location filename="../../settingsdialog.cpp" line="231"/>
+        <location filename="../../settingsdialog.cpp" line="244"/>
         <source>System Default</source>
         <translation>Стандартнай язык системы</translation>
     </message>