Fix issues.

Improve UI.

12 files changed, 941 insertions, 741 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c11b26af..d7c0785b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(GpgFrontend VERSION 1.1.0 LANGUAGES CXX)
+project(GpgFrontend VERSION 1.1.1 LANGUAGES CXX)
 
 message(STATUS "GPGFrontend Build Configuration Started CMAKE Version ${CMAKE_VERSION}")
 
diff --git a/include/ui/WaitingDialog.h b/include/ui/WaitingDialog.h
index 64c77ad9..df781073 100644
--- a/include/ui/WaitingDialog.h
+++ b/include/ui/WaitingDialog.h
@@ -28,7 +28,7 @@ class WaitingDialog : public QDialog {
 Q_OBJECT
 public:
 
-    WaitingDialog(QWidget *parent = nullptr);
+    WaitingDialog(const QString &title, QWidget *parent);
 
 public slots:
 
diff --git a/resource/ts/gpg_frontend_fr.ts b/resource/ts/gpg_frontend_fr.ts
index a32fcc56..5399b146 100644
--- a/resource/ts/gpg_frontend_fr.ts
+++ b/resource/ts/gpg_frontend_fr.ts
@@ -411,42 +411,32 @@
 <context>
     <name>GpgME::GpgContext</name>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="90"/>
-        <source>ENV Loading Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="91"/>
-        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="577"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="580"/>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="585"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="588"/>
         <source>Enter Password for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="589"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="592"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>Key Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>No Private Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="804"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="787"/>
         <source>Error in signing:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,173 +1925,208 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     <name>MainWindow</name>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="37"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="88"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="220"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="419"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="562"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="705"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="103"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="269"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="493"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="668"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="849"/>
         <source>No Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="44"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="95"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="426"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="569"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="110"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="500"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="675"/>
         <source>Invalid Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="45"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="427"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="570"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="501"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="676"/>
         <source>The selected key contains a key that does not actually have a encrypt usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="96"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="64"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="521"/>
+        <source>Encrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="111"/>
         <source>The selected key contains a key that does not actually have a signature usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="232"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="717"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="127"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="696"/>
+        <source>Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="170"/>
+        <source>Decrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="229"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="780"/>
+        <source>Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="281"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="861"/>
         <source>Invalid KeyPair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="233"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="718"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="282"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="862"/>
         <source>The selected keypair cannot be used for signing and encryption at the same time.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="244"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="251"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="729"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="736"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="293"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="300"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="873"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="880"/>
         <source>Incomplete Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="245"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="730"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="294"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="874"/>
         <source>None of the selected key pairs can provide the encryption function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="252"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="737"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="301"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="881"/>
         <source>None of the selected key pairs can provide the signature function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="626"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="317"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="899"/>
+        <source>Encrypting and Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="369"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="975"/>
+        <source>Decrypting and Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="754"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
         <source>No permission to read this file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
         <source>No permission to create file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="406"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="491"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="549"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="692"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="480"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="580"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="655"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="836"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="407"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="492"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="550"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="693"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="481"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="581"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="656"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="837"/>
         <source>The target file already exists, do you need to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>An error occurred during operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="627"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="755"/>
         <source>Please select the appropriate target file or signature file. Ensure that both are in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
         <source>No permission to read target file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
         <source>No permission to read signature file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
         <source>Select a file(.gpg/.asc) before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="46"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="97"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="234"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="428"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="571"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="719"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="112"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="283"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="502"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="677"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="863"/>
         <source>&lt;br/&gt;For example the Following Key: &lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
         <source>Select a file before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,6 +2645,16 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
         <source>Attached files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="46"/>
+        <source>ENV Loading Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="47"/>
+        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MimeTab</name>
@@ -2776,7 +2811,7 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     </message>
     <message>
         <location filename="../../src/ui/QuitDialog.cpp" line="77"/>
-        <source>&lt;h3&gt;%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?&lt;/h3&gt;</source>
+        <source>%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2922,62 +2957,62 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
 <context>
     <name>TextEdit</name>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="49"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="56"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="99"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="131"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="123"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="106"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="178"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="273"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="415"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="337"/>
+        <source>The document &quot;%1&quot; has been modified. Do you want to save your changes?&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="484"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="100"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="132"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="416"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="124"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="204"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="485"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="181"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="254"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="182"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="267"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="336"/>
         <source>Unsaved document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="268"/>
-        <source>&lt;h3&gt;The document &quot;%1&quot; has been modified.&lt;br/&gt;Do you want to save your changes?&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="270"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="340"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; If you don&apos;t save these files, all changes are lost.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpg_frontend_ru.ts b/resource/ts/gpg_frontend_ru.ts
index ccbd15a0..0fbf5c03 100644
--- a/resource/ts/gpg_frontend_ru.ts
+++ b/resource/ts/gpg_frontend_ru.ts
@@ -411,42 +411,32 @@
 <context>
     <name>GpgME::GpgContext</name>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="90"/>
-        <source>ENV Loading Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="91"/>
-        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="577"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="580"/>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="585"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="588"/>
         <source>Enter Password for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="589"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="592"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>Key Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>No Private Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="804"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="787"/>
         <source>Error in signing:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,173 +1925,208 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     <name>MainWindow</name>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="37"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="88"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="220"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="419"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="562"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="705"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="103"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="269"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="493"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="668"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="849"/>
         <source>No Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="44"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="95"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="426"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="569"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="110"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="500"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="675"/>
         <source>Invalid Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="45"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="427"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="570"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="501"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="676"/>
         <source>The selected key contains a key that does not actually have a encrypt usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="96"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="64"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="521"/>
+        <source>Encrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="111"/>
         <source>The selected key contains a key that does not actually have a signature usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="232"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="717"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="127"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="696"/>
+        <source>Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="170"/>
+        <source>Decrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="229"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="780"/>
+        <source>Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="281"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="861"/>
         <source>Invalid KeyPair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="233"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="718"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="282"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="862"/>
         <source>The selected keypair cannot be used for signing and encryption at the same time.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="244"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="251"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="729"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="736"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="293"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="300"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="873"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="880"/>
         <source>Incomplete Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="245"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="730"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="294"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="874"/>
         <source>None of the selected key pairs can provide the encryption function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="252"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="737"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="301"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="881"/>
         <source>None of the selected key pairs can provide the signature function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="626"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="317"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="899"/>
+        <source>Encrypting and Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="369"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="975"/>
+        <source>Decrypting and Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="754"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
         <source>No permission to read this file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
         <source>No permission to create file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="406"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="491"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="549"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="692"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="480"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="580"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="655"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="836"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="407"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="492"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="550"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="693"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="481"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="581"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="656"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="837"/>
         <source>The target file already exists, do you need to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>An error occurred during operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="627"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="755"/>
         <source>Please select the appropriate target file or signature file. Ensure that both are in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
         <source>No permission to read target file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
         <source>No permission to read signature file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
         <source>Select a file(.gpg/.asc) before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="46"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="97"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="234"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="428"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="571"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="719"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="112"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="283"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="502"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="677"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="863"/>
         <source>&lt;br/&gt;For example the Following Key: &lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
         <source>Select a file before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,6 +2645,16 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
         <source>Attached files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="46"/>
+        <source>ENV Loading Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="47"/>
+        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MimeTab</name>
@@ -2776,7 +2811,7 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     </message>
     <message>
         <location filename="../../src/ui/QuitDialog.cpp" line="77"/>
-        <source>&lt;h3&gt;%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?&lt;/h3&gt;</source>
+        <source>%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2922,62 +2957,62 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
 <context>
     <name>TextEdit</name>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="49"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="56"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="99"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="131"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="123"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="106"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="178"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="273"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="415"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="337"/>
+        <source>The document &quot;%1&quot; has been modified. Do you want to save your changes?&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="484"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="100"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="132"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="416"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="124"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="204"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="485"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="181"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="254"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="182"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="267"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="336"/>
         <source>Unsaved document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="268"/>
-        <source>&lt;h3&gt;The document &quot;%1&quot; has been modified.&lt;br/&gt;Do you want to save your changes?&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="270"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="340"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; If you don&apos;t save these files, all changes are lost.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_en_us.ts b/resource/ts/gpgfrontend_en_us.ts
index c718def2..101b1cb6 100644
--- a/resource/ts/gpgfrontend_en_us.ts
+++ b/resource/ts/gpgfrontend_en_us.ts
@@ -411,42 +411,32 @@
 <context>
     <name>GpgME::GpgContext</name>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="90"/>
-        <source>ENV Loading Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="91"/>
-        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="577"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="580"/>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="585"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="588"/>
         <source>Enter Password for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="589"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="592"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>Key Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>No Private Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="804"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="787"/>
         <source>Error in signing:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,173 +1925,208 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     <name>MainWindow</name>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="37"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="88"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="220"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="419"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="562"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="705"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="103"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="269"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="493"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="668"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="849"/>
         <source>No Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="44"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="95"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="426"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="569"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="110"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="500"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="675"/>
         <source>Invalid Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="45"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="427"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="570"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="501"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="676"/>
         <source>The selected key contains a key that does not actually have a encrypt usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="96"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="64"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="521"/>
+        <source>Encrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="111"/>
         <source>The selected key contains a key that does not actually have a signature usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="232"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="717"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="127"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="696"/>
+        <source>Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="170"/>
+        <source>Decrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="229"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="780"/>
+        <source>Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="281"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="861"/>
         <source>Invalid KeyPair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="233"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="718"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="282"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="862"/>
         <source>The selected keypair cannot be used for signing and encryption at the same time.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="244"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="251"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="729"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="736"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="293"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="300"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="873"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="880"/>
         <source>Incomplete Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="245"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="730"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="294"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="874"/>
         <source>None of the selected key pairs can provide the encryption function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="252"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="737"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="301"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="881"/>
         <source>None of the selected key pairs can provide the signature function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="626"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="317"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="899"/>
+        <source>Encrypting and Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="369"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="975"/>
+        <source>Decrypting and Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="754"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
         <source>No permission to read this file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
         <source>No permission to create file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="406"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="491"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="549"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="692"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="480"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="580"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="655"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="836"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="407"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="492"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="550"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="693"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="481"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="581"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="656"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="837"/>
         <source>The target file already exists, do you need to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>An error occurred during operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="627"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="755"/>
         <source>Please select the appropriate target file or signature file. Ensure that both are in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
         <source>No permission to read target file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
         <source>No permission to read signature file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
         <source>Select a file(.gpg/.asc) before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="46"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="97"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="234"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="428"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="571"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="719"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="112"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="283"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="502"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="677"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="863"/>
         <source>&lt;br/&gt;For example the Following Key: &lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
         <source>Select a file before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,6 +2645,16 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
         <source>Attached files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="46"/>
+        <source>ENV Loading Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="47"/>
+        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MimeTab</name>
@@ -2776,7 +2811,7 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     </message>
     <message>
         <location filename="../../src/ui/QuitDialog.cpp" line="77"/>
-        <source>&lt;h3&gt;%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?&lt;/h3&gt;</source>
+        <source>%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2922,62 +2957,62 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
 <context>
     <name>TextEdit</name>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="49"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="56"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="99"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="131"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="123"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="106"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="178"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="273"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="415"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="337"/>
+        <source>The document &quot;%1&quot; has been modified. Do you want to save your changes?&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="484"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="100"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="132"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="416"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="124"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="204"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="485"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="181"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="254"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="182"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="267"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="336"/>
         <source>Unsaved document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="268"/>
-        <source>&lt;h3&gt;The document &quot;%1&quot; has been modified.&lt;br/&gt;Do you want to save your changes?&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="270"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="340"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; If you don&apos;t save these files, all changes are lost.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_zh_chs.ts b/resource/ts/gpgfrontend_zh_chs.ts
index 7bf4bd62..86c632f6 100644
--- a/resource/ts/gpgfrontend_zh_chs.ts
+++ b/resource/ts/gpgfrontend_zh_chs.ts
@@ -411,42 +411,32 @@
 <context>
     <name>GpgME::GpgContext</name>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="90"/>
-        <source>ENV Loading Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="91"/>
-        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="577"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="580"/>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="585"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="588"/>
         <source>Enter Password for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="589"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="592"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>Key Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>No Private Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="804"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="787"/>
         <source>Error in signing:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,173 +1925,208 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     <name>MainWindow</name>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="37"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="88"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="220"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="419"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="562"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="705"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="103"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="269"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="493"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="668"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="849"/>
         <source>No Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="44"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="95"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="426"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="569"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="110"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="500"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="675"/>
         <source>Invalid Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="45"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="427"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="570"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="501"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="676"/>
         <source>The selected key contains a key that does not actually have a encrypt usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="96"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="64"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="521"/>
+        <source>Encrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="111"/>
         <source>The selected key contains a key that does not actually have a signature usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="232"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="717"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="127"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="696"/>
+        <source>Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="170"/>
+        <source>Decrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="229"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="780"/>
+        <source>Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="281"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="861"/>
         <source>Invalid KeyPair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="233"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="718"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="282"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="862"/>
         <source>The selected keypair cannot be used for signing and encryption at the same time.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="244"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="251"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="729"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="736"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="293"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="300"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="873"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="880"/>
         <source>Incomplete Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="245"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="730"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="294"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="874"/>
         <source>None of the selected key pairs can provide the encryption function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="252"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="737"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="301"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="881"/>
         <source>None of the selected key pairs can provide the signature function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="626"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="317"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="899"/>
+        <source>Encrypting and Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="369"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="975"/>
+        <source>Decrypting and Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="754"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
         <source>No permission to read this file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
         <source>No permission to create file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="406"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="491"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="549"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="692"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="480"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="580"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="655"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="836"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="407"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="492"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="550"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="693"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="481"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="581"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="656"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="837"/>
         <source>The target file already exists, do you need to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>An error occurred during operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="627"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="755"/>
         <source>Please select the appropriate target file or signature file. Ensure that both are in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
         <source>No permission to read target file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
         <source>No permission to read signature file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
         <source>Select a file(.gpg/.asc) before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="46"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="97"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="234"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="428"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="571"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="719"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="112"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="283"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="502"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="677"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="863"/>
         <source>&lt;br/&gt;For example the Following Key: &lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
         <source>Select a file before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,6 +2645,16 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
         <source>Attached files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="46"/>
+        <source>ENV Loading Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="47"/>
+        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MimeTab</name>
@@ -2776,7 +2811,7 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     </message>
     <message>
         <location filename="../../src/ui/QuitDialog.cpp" line="77"/>
-        <source>&lt;h3&gt;%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?&lt;/h3&gt;</source>
+        <source>%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2922,62 +2957,62 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
 <context>
     <name>TextEdit</name>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="49"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="56"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="99"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="131"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="123"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="106"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="178"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="273"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="415"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="337"/>
+        <source>The document &quot;%1&quot; has been modified. Do you want to save your changes?&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="484"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="100"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="132"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="416"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="124"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="204"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="485"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="181"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="254"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="182"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="267"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="336"/>
         <source>Unsaved document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="268"/>
-        <source>&lt;h3&gt;The document &quot;%1&quot; has been modified.&lt;br/&gt;Do you want to save your changes?&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="270"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="340"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; If you don&apos;t save these files, all changes are lost.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_zh_cht.ts b/resource/ts/gpgfrontend_zh_cht.ts
index 7bf4bd62..86c632f6 100644
--- a/resource/ts/gpgfrontend_zh_cht.ts
+++ b/resource/ts/gpgfrontend_zh_cht.ts
@@ -411,42 +411,32 @@
 <context>
     <name>GpgME::GpgContext</name>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="90"/>
-        <source>ENV Loading Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="91"/>
-        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="577"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="580"/>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="585"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="588"/>
         <source>Enter Password for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="589"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="592"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>Key Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="764"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="747"/>
         <source>No Private Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/gpg/GpgContext.cpp" line="804"/>
+        <location filename="../../src/gpg/GpgContext.cpp" line="787"/>
         <source>Error in signing:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1935,173 +1925,208 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     <name>MainWindow</name>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="37"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="88"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="220"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="419"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="562"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="705"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="103"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="269"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="493"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="668"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="849"/>
         <source>No Key Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="44"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="95"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="426"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="569"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="110"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="500"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="675"/>
         <source>Invalid Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="45"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="427"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="570"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="501"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="676"/>
         <source>The selected key contains a key that does not actually have a encrypt usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="96"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="64"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="521"/>
+        <source>Encrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="111"/>
         <source>The selected key contains a key that does not actually have a signature usage.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="232"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="717"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="127"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="696"/>
+        <source>Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="170"/>
+        <source>Decrypting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="229"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="780"/>
+        <source>Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="281"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="861"/>
         <source>Invalid KeyPair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="233"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="718"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="282"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="862"/>
         <source>The selected keypair cannot be used for signing and encryption at the same time.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="244"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="251"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="729"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="736"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="293"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="300"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="873"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="880"/>
         <source>Incomplete Operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="245"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="730"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="294"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="874"/>
         <source>None of the selected key pairs can provide the encryption function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="252"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="737"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="301"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="881"/>
         <source>None of the selected key pairs can provide the signature function.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="626"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="317"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="899"/>
+        <source>Encrypting and Signing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="369"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="975"/>
+        <source>Decrypting and Verifying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="754"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="397"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="472"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="539"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="683"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="782"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="471"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="561"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="645"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="827"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="943"/>
         <source>No permission to read this file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="401"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="476"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="543"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="687"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="786"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="475"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="565"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="649"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="831"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="947"/>
         <source>No permission to create file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="406"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="491"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="549"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="692"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="480"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="580"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="655"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="836"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="407"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="492"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="550"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="693"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="481"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="581"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="656"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="837"/>
         <source>The target file already exists, do you need to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="455"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="519"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="598"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="666"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="767"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="830"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="544"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="625"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="722"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="810"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="927"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="1007"/>
         <source>An error occurred during operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="627"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="755"/>
         <source>Please select the appropriate target file or signature file. Ensure that both are in this directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="631"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="759"/>
         <source>No permission to read target file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="635"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="763"/>
         <source>No permission to read signature file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="778"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="939"/>
         <source>Select a file(.gpg/.asc) before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="46"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="97"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="234"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="428"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="571"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="719"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="112"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="283"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="502"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="677"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="863"/>
         <source>&lt;br/&gt;For example the Following Key: &lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="393"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="468"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="535"/>
-        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="679"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="467"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="557"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="641"/>
+        <location filename="../../src/ui/main_window/MainWindowSlotFunction.cpp" line="823"/>
         <source>Select a file before doing it.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,6 +2645,16 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
         <source>Attached files:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="46"/>
+        <source>ENV Loading Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/MainWindow.cpp" line="47"/>
+        <source>Gnupg is not installed correctly, please follow the ReadME instructions to install gnupg and then open GPGFrontend.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MimeTab</name>
@@ -2776,7 +2811,7 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
     </message>
     <message>
         <location filename="../../src/ui/QuitDialog.cpp" line="77"/>
-        <source>&lt;h3&gt;%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?&lt;/h3&gt;</source>
+        <source>%1 files contain unsaved information.&lt;br/&gt;Save the changes before closing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2922,62 +2957,62 @@ This is NOT your Public Key, so DON&apos;T give it away.&lt;br /&gt;Do you REALL
 <context>
     <name>TextEdit</name>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="49"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="56"/>
         <source>untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="99"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="131"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="123"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="106"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="178"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="203"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="273"/>
         <source>Save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="415"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="337"/>
+        <source>The document &quot;%1&quot; has been modified. Do you want to save your changes?&lt;br/&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="484"/>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="100"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="132"/>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="416"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="124"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="204"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="485"/>
         <source>Cannot read file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="181"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="254"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="182"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="255"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="267"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="336"/>
         <source>Unsaved document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="268"/>
-        <source>&lt;h3&gt;The document &quot;%1&quot; has been modified.&lt;br/&gt;Do you want to save your changes?&lt;/h3&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/ui/widgets/TextEdit.cpp" line="270"/>
+        <location filename="../../src/ui/widgets/TextEdit.cpp" line="340"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; If you don&apos;t save these files, all changes are lost.&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a59bd01d..35890a47 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -29,7 +29,7 @@ MainWindow::MainWindow()
       settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini",
                QSettings::IniFormat) {
 
-  auto waitingDialog = new WaitingDialog(this);
+  auto waitingDialog = new WaitingDialog("Loading", this);
 
   auto ctx_thread = QThread::create([&]() { mCtx = new GpgME::GpgContext(); });
 
diff --git a/src/gpg/GpgContext.cpp b/src/gpg/GpgContext.cpp
index e94ce1ab..028653b7 100644
--- a/src/gpg/GpgContext.cpp
+++ b/src/gpg/GpgContext.cpp
@@ -659,16 +659,16 @@ namespace GpgME {
     bool GpgContext::exportSecretKey(const GpgKey &key, QByteArray *outBuffer) {
         qDebug() << "Export Secret Key" << key.id;
         gpgme_key_t target_key[2] = {
-            key.key_refer,
-            nullptr
+                key.key_refer,
+                nullptr
         };
 
         gpgme_data_t dataOut;
         gpgme_data_new(&dataOut);
         // export private key to outBuffer
-        gpgme_error_t error = gpgme_op_export_keys(mCtx, target_key,GPGME_EXPORT_MODE_SECRET, dataOut);
+        gpgme_error_t error = gpgme_op_export_keys(mCtx, target_key, GPGME_EXPORT_MODE_SECRET, dataOut);
 
-        if(gpgme_err_code(error) != GPG_ERR_NO_ERROR) {
+        if (gpgme_err_code(error) != GPG_ERR_NO_ERROR) {
             checkErr(error);
             gpgme_data_release(dataOut);
             return false;
@@ -734,26 +734,6 @@ namespace GpgME {
         return gpgmeError;
     }
 
-    /***
-      * return type should contain:
-      * -> list of sigs
-      * -> valid
-      * -> decrypted message
-      */
-    //void GpgContext::decryptVerify(QByteArray in) {
-
-    /*    gpgme_error_t err;
-        gpgme_data_t in, out;
-
-        gpgme_decrypt_result_t decrypt_result;
-        gpgme_verify_result_t verify_result;
-
-        err = gpgme_op_decrypt_verify (mCtx, in, out);
-        decrypt_result = gpgme_op_decrypt_result (mCtx);
-
-        verify_result = gpgme_op_verify_result (mCtx);
-     */
-    //}
     gpg_error_t
     GpgContext::sign(const QVector<GpgKey> &keys, const QByteArray &inBuffer, QByteArray *outBuffer, bool detached,
                      gpgme_sign_result_t *result) {
@@ -962,7 +942,7 @@ namespace GpgME {
     void GpgContext::setSigners(const QVector<GpgKey> &keys) {
         gpgme_signers_clear(mCtx);
         for (const auto &key : keys) {
-            if(checkIfKeyCanSign(key)) {
+            if (checkIfKeyCanSign(key)) {
                 auto gpgmeError = gpgme_signers_add(mCtx, key.key_refer);
                 checkErr(gpgmeError);
             }
@@ -1180,7 +1160,7 @@ namespace GpgME {
             }
         }
 
-        if(gpgme_err_code(err) != GPG_ERR_NO_ERROR)
+        if (gpgme_err_code(err) != GPG_ERR_NO_ERROR)
             checkErr(err);
 
         if (dataIn) {
@@ -1240,11 +1220,11 @@ namespace GpgME {
             return false;
         }
 
-        for (const auto& key : keys) {
+        for (const auto &key : keys) {
             err = gpgme_data_new(&dataOut);
             checkErr(err);
 
-            err = gpgme_op_export(mCtx,key.id.toUtf8().constData(), 0, dataOut);
+            err = gpgme_op_export(mCtx, key.id.toUtf8().constData(), 0, dataOut);
             checkErr(err);
 
             read_bytes = gpgme_data_seek(dataOut, 0, SEEK_END);
diff --git a/src/ui/WaitingDialog.cpp b/src/ui/WaitingDialog.cpp
index 8281385a..bc21a17d 100644
--- a/src/ui/WaitingDialog.cpp
+++ b/src/ui/WaitingDialog.cpp
@@ -1,15 +1,19 @@
 #include "ui/WaitingDialog.h"
 
-WaitingDialog::WaitingDialog(QWidget *parent) : QDialog(parent) {
+WaitingDialog::WaitingDialog(const QString &title, QWidget *parent) : QDialog(parent) {
     auto *pb = new QProgressBar();
     pb->setRange(0, 0);
+    pb->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
     auto *layout = new QVBoxLayout();
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
     layout->addWidget(pb);
     this->setLayout(layout);
 
     this->setModal(true);
-    this->setWindowTitle(tr("Processing"));
+    this->setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
+    this->setWindowTitle(title);
     this->setFixedSize(240, 42);
     this->show();
 }
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 36d8f363..21d0af0d 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -61,9 +61,9 @@ void MainWindow::slotEncrypt() {
 
         thread->start();
 
-        WaitingDialog *dialog = new WaitingDialog(this);
+        auto *dialog = new WaitingDialog(tr("Encrypting"), this);
 
-        while(thread->isRunning()) {
+        while (thread->isRunning()) {
             QApplication::processEvents();
         }
 
@@ -118,7 +118,18 @@ void MainWindow::slotSign() {
 
         gpgme_sign_result_t result = nullptr;
 
-        auto error = mCtx->sign(keys, edit->curTextPage()->toPlainText().toUtf8(), tmp, false, &result);
+        gpgme_error_t error;
+        auto thread = QThread::create([&]() {
+            error = mCtx->sign(keys, edit->curTextPage()->toPlainText().toUtf8(), tmp, false, &result);
+        });
+        thread->start();
+
+        auto *dialog = new WaitingDialog(tr("Signing"), this);
+        while (thread->isRunning()) {
+            QApplication::processEvents();
+        }
+        dialog->close();
+
         infoBoard->associateTextEdit(edit->curTextPage());
         edit->slotFillTextEditWithText(QString::fromUtf8(*tmp));
 
@@ -156,8 +167,8 @@ void MainWindow::slotDecrypt() {
         });
         thread->start();
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
+        auto *dialog = new WaitingDialog(tr("Decrypting"), this);
+        while (thread->isRunning()) {
             QApplication::processEvents();
         }
 
@@ -215,11 +226,10 @@ void MainWindow::slotVerify() {
         });
         thread->start();
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
+        auto *dialog = new WaitingDialog(tr("Verifying"), this);
+        while (thread->isRunning()) {
             QApplication::processEvents();
         }
-
         dialog->close();
 
         auto resultAnalyse = new VerifyResultAnalyse(mCtx, error, result);
@@ -268,27 +278,27 @@ void MainWindow::slotEncryptSign() {
 
             if (!key_can_sign && !key_can_encr) {
                 QMessageBox::critical(nullptr,
-                                         tr("Invalid KeyPair"),
-                                         tr("The selected keypair cannot be used for signing and encryption at the same time.<br/>")
-                                         + tr("<br/>For example the Following Key: <br/>") + key.uids.first().uid);
+                                      tr("Invalid KeyPair"),
+                                      tr("The selected keypair cannot be used for signing and encryption at the same time.<br/>")
+                                      + tr("<br/>For example the Following Key: <br/>") + key.uids.first().uid);
                 return;
             }
 
-            if(key_can_sign) can_sign = true;
-            if(key_can_encr) can_encr = true;
+            if (key_can_sign) can_sign = true;
+            if (key_can_encr) can_encr = true;
         }
 
-        if(!can_encr) {
-                QMessageBox::critical(nullptr,
-                                         tr("Incomplete Operation"),
-                                         tr("None of the selected key pairs can provide the encryption function."));
-                return;
+        if (!can_encr) {
+            QMessageBox::critical(nullptr,
+                                  tr("Incomplete Operation"),
+                                  tr("None of the selected key pairs can provide the encryption function."));
+            return;
         }
 
-        if(!can_sign) {
-                QMessageBox::warning(nullptr,
-                                         tr("Incomplete Operation"),
-                                         tr("None of the selected key pairs can provide the signature function."));
+        if (!can_sign) {
+            QMessageBox::warning(nullptr,
+                                 tr("Incomplete Operation"),
+                                 tr("None of the selected key pairs can provide the signature function."));
         }
 
         auto *tmp = new QByteArray();
@@ -300,18 +310,18 @@ void MainWindow::slotEncryptSign() {
         gpgme_error_t error;
         auto thread = QThread::create([&]() {
             error = mCtx->encryptSign(keys, edit->curTextPage()->toPlainText().toUtf8(), tmp, &encr_result,
-                                       &sign_result);
+                                      &sign_result);
         });
         thread->start();
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
+        auto *dialog = new WaitingDialog(tr("Encrypting and Signing"), this);
+        while (thread->isRunning()) {
             QApplication::processEvents();
         }
 
         dialog->close();
 
-        if(gpgme_err_code(error) == GPG_ERR_NO_ERROR) {
+        if (gpgme_err_code(error) == GPG_ERR_NO_ERROR) {
             auto *tmp2 = new QString(*tmp);
             edit->slotFillTextEditWithText(*tmp2);
         }
@@ -356,8 +366,8 @@ void MainWindow::slotDecryptVerify() {
         });
         thread->start();
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
+        WaitingDialog *dialog = new WaitingDialog(tr("Decrypting and Verifying"), this);
+        while (thread->isRunning()) {
             QApplication::processEvents();
         }
 
@@ -495,22 +505,26 @@ void MainWindow::slotFileEncrypt() {
         }
     }
 
-    try {
-        gpgme_encrypt_result_t result;
+    gpgme_encrypt_result_t result;
 
-        gpgme_error_t error;
-        auto thread = QThread::create([&]() {
+    gpgme_error_t error;
+    bool if_error = false;
+    auto thread = QThread::create([&]() {
+        try {
             error = GpgFileOpera::encryptFile(mCtx, keys, path, &result);
-        });
-        thread->start();
-
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
-            QApplication::processEvents();
+        } catch (const std::runtime_error &e) {
+            if_error = true;
         }
+    });
+    thread->start();
 
-        dialog->close();
+    auto *dialog = new WaitingDialog(tr("Encrypting"), this);
+    while (thread->isRunning()) {
+        QApplication::processEvents();
+    }
 
+    dialog->close();
+    if(!if_error) {
         auto resultAnalyse = new EncryptResultAnalyse(error, result);
         auto &reportText = resultAnalyse->getResultReport();
         infoBoard->associateTabWidget(edit->tabWidget);
@@ -526,11 +540,10 @@ void MainWindow::slotFileEncrypt() {
         delete resultAnalyse;
 
         fileTreeView->update();
-
-    } catch (const std::runtime_error &e) {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("An error occurred during operation."));
+        return;
     }
-
 }
 
 void MainWindow::slotFileDecrypt() {
@@ -572,21 +585,27 @@ void MainWindow::slotFileDecrypt() {
             return;
     }
 
-    try {
-        gpgme_decrypt_result_t result;
-        gpgme_error_t error;
-        auto thread = QThread::create([&]() {
-            error = GpgFileOpera::decryptFile(mCtx, path, &result);
-        });
-        thread->start();
+    gpgme_decrypt_result_t result;
+    gpgme_error_t error;
+    bool if_error = false;
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
-            QApplication::processEvents();
+    auto thread = QThread::create([&]() {
+        try {
+            error = GpgFileOpera::decryptFile(mCtx, path, &result);
+        } catch (const std::runtime_error &e) {
+            if_error = true;
         }
+    });
+    thread->start();
 
-        dialog->close();
+    auto *dialog = new WaitingDialog("Decrypting", this);
+    while (thread->isRunning()) {
+        QApplication::processEvents();
+    }
 
+    dialog->close();
+
+    if(!if_error) {
         auto resultAnalyse = new DecryptResultAnalyse(mCtx, error, result);
         auto &reportText = resultAnalyse->getResultReport();
         infoBoard->associateTabWidget(edit->tabWidget);
@@ -602,7 +621,7 @@ void MainWindow::slotFileDecrypt() {
         delete resultAnalyse;
 
         fileTreeView->update();
-    } catch (const std::runtime_error &e) {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("An error occurred during operation."));
         return;
     }
@@ -661,20 +680,27 @@ void MainWindow::slotFileSign() {
         }
     }
 
-    try {
-        gpgme_sign_result_t result;
-        gpgme_error_t error;
-        auto thread = QThread::create([&]() {
-            error = GpgFileOpera::signFile(mCtx, keys, path, &result);
-        });
-        thread->start();
+    gpgme_sign_result_t result;
+    gpgme_error_t error;
+    bool if_error = false;
 
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
-            QApplication::processEvents();
+    auto thread = QThread::create([&]() {
+        try {
+            error = GpgFileOpera::signFile(mCtx, keys, path, &result);
+        } catch (const std::runtime_error &e) {
+            if_error = true;
         }
+    });
+    thread->start();
 
-        dialog->close();
+    auto *dialog = new WaitingDialog(tr("Signing"), this);
+    while (thread->isRunning()) {
+        QApplication::processEvents();
+    }
+
+    dialog->close();
+
+    if(!if_error) {
 
         auto resultAnalyse = new SignResultAnalyse(error, result);
         auto &reportText = resultAnalyse->getResultReport();
@@ -692,8 +718,9 @@ void MainWindow::slotFileSign() {
 
         fileTreeView->update();
 
-    } catch (const std::runtime_error &e) {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("An error occurred during operation."));
+        return;
     }
 
     fileTreeView->update();
@@ -709,11 +736,10 @@ void MainWindow::slotFileVerify() {
 
     QString signFilePath, dataFilePath;
 
-    if(fileInfo.suffix() == "gpg") {
+    if (fileInfo.suffix() == "gpg") {
         dataFilePath = path;
         signFilePath = path;
-    }
-    else if (fileInfo.suffix() == "sig") {
+    } else if (fileInfo.suffix() == "sig") {
         int pos = path.lastIndexOf(QChar('.'));
         dataFilePath = path.left(pos);
         signFilePath = path;
@@ -743,7 +769,7 @@ void MainWindow::slotFileVerify() {
     gpgme_error_t error;
     bool if_error = false;
     auto thread = QThread::create([&]() {
-        try{
+        try {
             error = GpgFileOpera::verifyFile(mCtx, dataFilePath, &result);
         } catch (const std::runtime_error &e) {
             if_error = true;
@@ -751,13 +777,13 @@ void MainWindow::slotFileVerify() {
     });
     thread->start();
 
-    WaitingDialog *dialog = new WaitingDialog(this);
-    while(thread->isRunning()) {
+    auto *dialog = new WaitingDialog(tr("Verifying"), this);
+    while (thread->isRunning()) {
         QApplication::processEvents();
     }
     dialog->close();
 
-    if(!if_error) {
+    if (!if_error) {
         auto resultAnalyse = new VerifyResultAnalyse(mCtx, error, result);
         auto &reportText = resultAnalyse->getResultReport();
         infoBoard->associateTabWidget(edit->tabWidget);
@@ -832,45 +858,51 @@ void MainWindow::slotFileEncryptSign() {
 
         if (!key_can_sign && !key_can_encr) {
             QMessageBox::critical(nullptr,
-                                     tr("Invalid KeyPair"),
-                                     tr("The selected keypair cannot be used for signing and encryption at the same time.<br/>")
-                                     + tr("<br/>For example the Following Key: <br/>") + key.uids.first().uid);
+                                  tr("Invalid KeyPair"),
+                                  tr("The selected keypair cannot be used for signing and encryption at the same time.<br/>")
+                                  + tr("<br/>For example the Following Key: <br/>") + key.uids.first().uid);
             return;
         }
 
-        if(key_can_sign) can_sign = true;
-        if(key_can_encr) can_encr = true;
+        if (key_can_sign) can_sign = true;
+        if (key_can_encr) can_encr = true;
     }
 
-    if(!can_encr) {
-            QMessageBox::critical(nullptr,
-                                     tr("Incomplete Operation"),
-                                     tr("None of the selected key pairs can provide the encryption function."));
-            return;
+    if (!can_encr) {
+        QMessageBox::critical(nullptr,
+                              tr("Incomplete Operation"),
+                              tr("None of the selected key pairs can provide the encryption function."));
+        return;
     }
 
-    if(!can_sign) {
-            QMessageBox::warning(nullptr,
-                                     tr("Incomplete Operation"),
-                                     tr("None of the selected key pairs can provide the signature function."));
+    if (!can_sign) {
+        QMessageBox::warning(nullptr,
+                             tr("Incomplete Operation"),
+                             tr("None of the selected key pairs can provide the signature function."));
     }
 
-    try {
+    gpgme_encrypt_result_t encr_result = nullptr;
+    gpgme_sign_result_t sign_result = nullptr;
 
-        gpgme_encrypt_result_t encr_result = nullptr;
-        gpgme_sign_result_t sign_result = nullptr;
+    gpgme_error_t error;
+    bool if_error = false;
 
-        gpgme_error_t error;
-        auto thread = QThread::create([&]() {
+    auto thread = QThread::create([&]() {
+        try {
             error = GpgFileOpera::encryptSignFile(mCtx, keys, path, &encr_result, &sign_result);
-        });
-        thread->start();
-
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
-            QApplication::processEvents();
+        } catch (const std::runtime_error &e) {
+            if_error = true;
         }
-        dialog->close();
+    });
+    thread->start();
+
+    WaitingDialog *dialog = new WaitingDialog(tr("Encrypting and Signing"), this);
+    while (thread->isRunning()) {
+        QApplication::processEvents();
+    }
+    dialog->close();
+
+    if(!if_error) {
 
         auto resultAnalyseEncr = new EncryptResultAnalyse(error, encr_result);
         auto resultAnalyseSign = new SignResultAnalyse(error, sign_result);
@@ -891,8 +923,9 @@ void MainWindow::slotFileEncryptSign() {
 
         fileTreeView->update();
 
-    } catch (std::runtime_error &e) {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("An error occurred during operation."));
+        return;
     }
 }
 
@@ -924,22 +957,28 @@ void MainWindow::slotFileDecryptVerify() {
         outFileName = path + ".out";
     }
 
-    try {
+    gpgme_decrypt_result_t d_result = nullptr;
+    gpgme_verify_result_t v_result = nullptr;
 
-        gpgme_decrypt_result_t d_result = nullptr;
-        gpgme_verify_result_t v_result = nullptr;
+    gpgme_error_t error;
+    bool if_error = false;
 
-        gpgme_error_t error;
-        auto thread = QThread::create([&]() {
+    auto thread = QThread::create([&]() {
+        try {
             error = GpgFileOpera::decryptVerifyFile(mCtx, path, &d_result, &v_result);
-        });
-        thread->start();
-
-        WaitingDialog *dialog = new WaitingDialog(this);
-        while(thread->isRunning()) {
-            QApplication::processEvents();
+        } catch (const std::runtime_error &e) {
+            if_error = true;
         }
-        dialog->close();
+    });
+    thread->start();
+
+    auto *dialog = new WaitingDialog(tr("Decrypting and Verifying"), this);
+    while (thread->isRunning()) {
+        QApplication::processEvents();
+    }
+    dialog->close();
+
+    if(!if_error) {
         infoBoard->associateFileTreeView(edit->curFilePage());
 
         auto resultAnalyseDecrypt = new DecryptResultAnalyse(mCtx, error, d_result);
@@ -964,7 +1003,7 @@ void MainWindow::slotFileDecryptVerify() {
         delete resultAnalyseVerify;
 
         fileTreeView->update();
-    } catch (std::runtime_error &e) {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("An error occurred during operation."));
         return;
     }
diff --git a/src/ui/widgets/TextEdit.cpp b/src/ui/widgets/TextEdit.cpp
index 26cc3834..f06b3a45 100644
--- a/src/ui/widgets/TextEdit.cpp
+++ b/src/ui/widgets/TextEdit.cpp
@@ -132,6 +132,7 @@ void TextEdit::slotInsertTargetTextPage(const QString &pagePtr,
     auto *taregtTextPage = qobject_cast<EditorPage *>(it.value());
     if (taregtTextPage != nullptr) {
       taregtTextPage->getTextPage()->insertPlainText(text);
+      taregtTextPage->getTextPage()->document()->setModified(false);
     }
   }
 }
@@ -164,6 +165,7 @@ void TextEdit::slotReadTargetTextPageDone(const QString &pagePtr) {
         tabWidget->setTabText(index,
                               strippedName(taregtTextPage->getFilePath()));
       }
+      taregtTextPage->getTextPage()->document()->setModified(false);
       connect(taregtTextPage->getTextPage()->document(),
               SIGNAL(modificationChanged(bool)), this,
               SLOT(slotShowModified()));