diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7ca1a3145..7d3f09121 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.thialfihar.android.apg"
-    android:versionCode="18" android:versionName="1.0.4">
+    android:versionCode="19" android:versionName="1.0.5">
 
     <application
         android:icon="@drawable/icon"
diff --git a/res/drawable-hdpi-v4/encrypted.png b/res/drawable-hdpi-v4/encrypted.png
index 6d7c616a4..541781cd1 100644
Binary files a/res/drawable-hdpi-v4/encrypted.png and b/res/drawable-hdpi-v4/encrypted.png differ
diff --git a/res/drawable-hdpi-v4/encrypted_large.png b/res/drawable-hdpi-v4/encrypted_large.png
index dc7466e45..209278377 100644
Binary files a/res/drawable-hdpi-v4/encrypted_large.png and b/res/drawable-hdpi-v4/encrypted_large.png differ
diff --git a/res/drawable-hdpi-v4/encrypted_small.png b/res/drawable-hdpi-v4/encrypted_small.png
index 5ed9fe4b8..3ff8e9b97 100644
Binary files a/res/drawable-hdpi-v4/encrypted_small.png and b/res/drawable-hdpi-v4/encrypted_small.png differ
diff --git a/res/drawable-hdpi-v4/icon.png b/res/drawable-hdpi-v4/icon.png
index 9e2e7c0e4..072f0a089 100644
Binary files a/res/drawable-hdpi-v4/icon.png and b/res/drawable-hdpi-v4/icon.png differ
diff --git a/res/drawable-hdpi-v4/key.png b/res/drawable-hdpi-v4/key.png
index 6f18c0240..af4742ec0 100644
Binary files a/res/drawable-hdpi-v4/key.png and b/res/drawable-hdpi-v4/key.png differ
diff --git a/res/drawable-hdpi-v4/key_large.png b/res/drawable-hdpi-v4/key_large.png
index 81816835d..590f7d5a4 100644
Binary files a/res/drawable-hdpi-v4/key_large.png and b/res/drawable-hdpi-v4/key_large.png differ
diff --git a/res/drawable-hdpi-v4/key_small.png b/res/drawable-hdpi-v4/key_small.png
index 3f42a0d9b..6966048a1 100644
Binary files a/res/drawable-hdpi-v4/key_small.png and b/res/drawable-hdpi-v4/key_small.png differ
diff --git a/res/drawable-hdpi-v4/overlay_error.png b/res/drawable-hdpi-v4/overlay_error.png
index db6a08329..e6d7e60ba 100644
Binary files a/res/drawable-hdpi-v4/overlay_error.png and b/res/drawable-hdpi-v4/overlay_error.png differ
diff --git a/res/drawable-hdpi-v4/overlay_ok.png b/res/drawable-hdpi-v4/overlay_ok.png
index 33dc08094..0672f869d 100644
Binary files a/res/drawable-hdpi-v4/overlay_ok.png and b/res/drawable-hdpi-v4/overlay_ok.png differ
diff --git a/res/drawable-hdpi-v4/signed.png b/res/drawable-hdpi-v4/signed.png
index 92e64dc51..ab9495e7b 100644
Binary files a/res/drawable-hdpi-v4/signed.png and b/res/drawable-hdpi-v4/signed.png differ
diff --git a/res/drawable-hdpi-v4/signed_large.png b/res/drawable-hdpi-v4/signed_large.png
index 53d8ac991..c209f4167 100644
Binary files a/res/drawable-hdpi-v4/signed_large.png and b/res/drawable-hdpi-v4/signed_large.png differ
diff --git a/res/drawable-hdpi-v4/signed_small.png b/res/drawable-hdpi-v4/signed_small.png
index d7f147f05..54c4906e8 100644
Binary files a/res/drawable-hdpi-v4/signed_small.png and b/res/drawable-hdpi-v4/signed_small.png differ
diff --git a/res/drawable-ldpi-v4/encrypted.png b/res/drawable-ldpi-v4/encrypted.png
index 7f4ab803f..bcd8cfc8e 100644
Binary files a/res/drawable-ldpi-v4/encrypted.png and b/res/drawable-ldpi-v4/encrypted.png differ
diff --git a/res/drawable-ldpi-v4/encrypted_large.png b/res/drawable-ldpi-v4/encrypted_large.png
index 2783804bc..34c3d3f97 100644
Binary files a/res/drawable-ldpi-v4/encrypted_large.png and b/res/drawable-ldpi-v4/encrypted_large.png differ
diff --git a/res/drawable-ldpi-v4/encrypted_small.png b/res/drawable-ldpi-v4/encrypted_small.png
index 0ffedf2dd..5e7294a4b 100644
Binary files a/res/drawable-ldpi-v4/encrypted_small.png and b/res/drawable-ldpi-v4/encrypted_small.png differ
diff --git a/res/drawable-ldpi-v4/icon.png b/res/drawable-ldpi-v4/icon.png
index 9d44341f1..e310c42e8 100644
Binary files a/res/drawable-ldpi-v4/icon.png and b/res/drawable-ldpi-v4/icon.png differ
diff --git a/res/drawable-ldpi-v4/key.png b/res/drawable-ldpi-v4/key.png
index 121803508..c806b6041 100644
Binary files a/res/drawable-ldpi-v4/key.png and b/res/drawable-ldpi-v4/key.png differ
diff --git a/res/drawable-ldpi-v4/key_large.png b/res/drawable-ldpi-v4/key_large.png
index de7e72524..aa499a5e1 100644
Binary files a/res/drawable-ldpi-v4/key_large.png and b/res/drawable-ldpi-v4/key_large.png differ
diff --git a/res/drawable-ldpi-v4/key_small.png b/res/drawable-ldpi-v4/key_small.png
index 1763c4256..073b95029 100644
Binary files a/res/drawable-ldpi-v4/key_small.png and b/res/drawable-ldpi-v4/key_small.png differ
diff --git a/res/drawable-ldpi-v4/overlay_error.png b/res/drawable-ldpi-v4/overlay_error.png
index 568f2b1ee..e5a88e18f 100644
Binary files a/res/drawable-ldpi-v4/overlay_error.png and b/res/drawable-ldpi-v4/overlay_error.png differ
diff --git a/res/drawable-ldpi-v4/overlay_ok.png b/res/drawable-ldpi-v4/overlay_ok.png
index db415a846..63374d47f 100644
Binary files a/res/drawable-ldpi-v4/overlay_ok.png and b/res/drawable-ldpi-v4/overlay_ok.png differ
diff --git a/res/drawable-ldpi-v4/signed.png b/res/drawable-ldpi-v4/signed.png
index 590220281..4202c3f97 100644
Binary files a/res/drawable-ldpi-v4/signed.png and b/res/drawable-ldpi-v4/signed.png differ
diff --git a/res/drawable-ldpi-v4/signed_large.png b/res/drawable-ldpi-v4/signed_large.png
index 490e94fbd..d2917644c 100644
Binary files a/res/drawable-ldpi-v4/signed_large.png and b/res/drawable-ldpi-v4/signed_large.png differ
diff --git a/res/drawable-ldpi-v4/signed_small.png b/res/drawable-ldpi-v4/signed_small.png
index ca33fc1f7..19d45f8da 100644
Binary files a/res/drawable-ldpi-v4/signed_small.png and b/res/drawable-ldpi-v4/signed_small.png differ
diff --git a/res/drawable-mdpi-v4/encrypted.png b/res/drawable-mdpi-v4/encrypted.png
index 2783804bc..34c3d3f97 100644
Binary files a/res/drawable-mdpi-v4/encrypted.png and b/res/drawable-mdpi-v4/encrypted.png differ
diff --git a/res/drawable-mdpi-v4/encrypted_large.png b/res/drawable-mdpi-v4/encrypted_large.png
index 6d7c616a4..541781cd1 100644
Binary files a/res/drawable-mdpi-v4/encrypted_large.png and b/res/drawable-mdpi-v4/encrypted_large.png differ
diff --git a/res/drawable-mdpi-v4/encrypted_small.png b/res/drawable-mdpi-v4/encrypted_small.png
index 7f4ab803f..bcd8cfc8e 100644
Binary files a/res/drawable-mdpi-v4/encrypted_small.png and b/res/drawable-mdpi-v4/encrypted_small.png differ
diff --git a/res/drawable-mdpi-v4/icon.png b/res/drawable-mdpi-v4/icon.png
index b4e4db40e..3c165f9bd 100644
Binary files a/res/drawable-mdpi-v4/icon.png and b/res/drawable-mdpi-v4/icon.png differ
diff --git a/res/drawable-mdpi-v4/key.png b/res/drawable-mdpi-v4/key.png
index de7e72524..aa499a5e1 100644
Binary files a/res/drawable-mdpi-v4/key.png and b/res/drawable-mdpi-v4/key.png differ
diff --git a/res/drawable-mdpi-v4/key_large.png b/res/drawable-mdpi-v4/key_large.png
index 6f18c0240..af4742ec0 100644
Binary files a/res/drawable-mdpi-v4/key_large.png and b/res/drawable-mdpi-v4/key_large.png differ
diff --git a/res/drawable-mdpi-v4/key_small.png b/res/drawable-mdpi-v4/key_small.png
index 121803508..c806b6041 100644
Binary files a/res/drawable-mdpi-v4/key_small.png and b/res/drawable-mdpi-v4/key_small.png differ
diff --git a/res/drawable-mdpi-v4/overlay_error.png b/res/drawable-mdpi-v4/overlay_error.png
index 2372de59e..5fe017433 100644
Binary files a/res/drawable-mdpi-v4/overlay_error.png and b/res/drawable-mdpi-v4/overlay_error.png differ
diff --git a/res/drawable-mdpi-v4/overlay_ok.png b/res/drawable-mdpi-v4/overlay_ok.png
index 2f0005898..b4f332260 100644
Binary files a/res/drawable-mdpi-v4/overlay_ok.png and b/res/drawable-mdpi-v4/overlay_ok.png differ
diff --git a/res/drawable-mdpi-v4/signed.png b/res/drawable-mdpi-v4/signed.png
index 490e94fbd..d2917644c 100644
Binary files a/res/drawable-mdpi-v4/signed.png and b/res/drawable-mdpi-v4/signed.png differ
diff --git a/res/drawable-mdpi-v4/signed_large.png b/res/drawable-mdpi-v4/signed_large.png
index 92e64dc51..ab9495e7b 100644
Binary files a/res/drawable-mdpi-v4/signed_large.png and b/res/drawable-mdpi-v4/signed_large.png differ
diff --git a/res/drawable-mdpi-v4/signed_small.png b/res/drawable-mdpi-v4/signed_small.png
index 590220281..4202c3f97 100644
Binary files a/res/drawable-mdpi-v4/signed_small.png and b/res/drawable-mdpi-v4/signed_small.png differ
diff --git a/res/layout/decrypt.xml b/res/layout/decrypt.xml
index 41bbee479..2acae3086 100644
--- a/res/layout/decrypt.xml
+++ b/res/layout/decrypt.xml
@@ -199,15 +199,15 @@
         <Button
             android:id="@+id/btn_reply"
             android:text="@string/btn_reply"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
             android:layout_weight="1"/>
 
         <Button
             android:id="@+id/btn_decrypt"
             android:text="@string/btn_decrypt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
             android:layout_weight="1"/>
 
     </LinearLayout>
diff --git a/res/layout/edit_key.xml b/res/layout/edit_key.xml
index bf994fa44..0b441b0a2 100644
--- a/res/layout/edit_key.xml
+++ b/res/layout/edit_key.xml
@@ -45,14 +45,14 @@
         <Button
             android:id="@+id/btn_save"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:text="@string/btn_save"/>
 
         <Button
             android:id="@+id/btn_discard"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"
             android:text="@string/btn_doNotSave"/>
 
diff --git a/res/layout/encrypt.xml b/res/layout/encrypt.xml
index dd51318c2..68808c8bf 100644
--- a/res/layout/encrypt.xml
+++ b/res/layout/encrypt.xml
@@ -368,14 +368,14 @@
             android:text="@string/btn_encryptToClipboard"
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"/>
+            android:layout_height="fill_parent"/>
 
         <Button
             android:id="@+id/btn_encrypt"
             android:text="@string/btn_encrypt"
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:layout_height="wrap_content"/>
+            android:layout_height="fill_parent"/>
 
     </LinearLayout>
 
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 3603f656e..803b2abe9 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -52,14 +52,14 @@
                 android:text="@string/btn_encryptFile"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
             <Button
                 android:id="@+id/btn_decryptFile"
                 android:text="@string/btn_decryptFile"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
         </LinearLayout>
 
@@ -73,14 +73,14 @@
                 android:text="@string/btn_encryptMessage"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
             <Button
                 android:id="@+id/btn_decryptMessage"
                 android:text="@string/btn_decryptMessage"
                 android:layout_width="0dip"
                 android:layout_weight="1"
-                android:layout_height="wrap_content"/>
+                android:layout_height="fill_parent"/>
 
         </LinearLayout>
 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b4954d8f5..a610cad95 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,21 +23,18 @@
     <string name="title_mailInbox">Posteingang</string>
     <string name="title_managePublicKeys">Öffentliche Schlüssel verwalten</string>
     <string name="title_manageSecretKeys">Private Schlüssel verwalten</string>
-
     <string name="title_selectRecipients">Empfänger auswählen</string>
     <string name="title_selectSignature">Signatur auswählen</string>
     <string name="title_encrypt">Verschlüsseln</string>
     <string name="title_decrypt">Entschlüsseln</string>
     <string name="title_authentification">Authentifizierung</string>
     <string name="title_createKey">Schlüssel erzeugen</string>
-
     <string name="title_editKey">Schlüssel bearbeiten</string>
     <string name="title_preferences">Einstellungen</string>
     <string name="title_changePassPhrase">Passwort ändern</string>
     <string name="title_setPassPhrase">Passwort wählen</string>
     <string name="title_sendEmail">"Mail senden ..."</string>
     <string name="title_encryptToFile">In eine Datei verschlüsseln</string>
-
     <string name="title_decryptToFile">In eine Datei entschlüsseln</string>
     <string name="title_addAccount">Konto hinzufügen</string>
     <string name="title_importKeys">Schlüssel importieren</string>
@@ -59,14 +56,12 @@
     <string name="btn_decrypt">Entschlüsseln</string>
     <string name="btn_verify">Verifizieren</string>
     <string name="btn_selectEncryptKeys">Empfänger auswählen</string>
-
     <string name="btn_reply">Antworten</string>
     <string name="btn_encryptMessage">Nachricht verschlüsseln</string>
     <string name="btn_decryptMessage">Nachricht entschlüsseln</string>
     <string name="btn_encryptFile">Datei verschlüsseln</string>
     <string name="btn_decryptFile">Datei entschlüsseln</string>
     <string name="btn_save">Speichern</string>
-
     <string name="btn_doNotSave">Abbrechen</string>
     <string name="btn_delete">Löschen</string>
     <string name="btn_noDate">Niemals</string>
@@ -74,21 +69,18 @@
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">Über</string>
-
     <string name="menu_addAccount">GMail-Konto hinzufügen</string>
     <string name="menu_deleteAccount">Konto entfernen</string>
     <string name="menu_managePublicKeys">Öffentliche Schlüssel verwalten</string>
     <string name="menu_manageSecretKeys">Private Schlüssel verwalten</string>
     <string name="menu_preferences">Einstellungen</string>
     <string name="menu_changePassPhrase">Passwort ändern</string>
-
     <string name="menu_setPassPhrase">Passwort wählen</string>
     <string name="menu_importKeys">Schlüssel importieren</string>
     <string name="menu_exportKeys">Mehrere Schlüssel exportieren</string>
     <string name="menu_exportKey">Einzelnen Schlüssel exportieren</string>
     <string name="menu_deleteKey">Einzelnen Schlüssel löschen</string>
     <string name="menu_createKey">Schlüssel erzeugen</string>
-
     <string name="menu_editKey">Schlüssel bearbeiten</string>
     <string name="menu_search">Suche</string>
 
@@ -96,21 +88,18 @@
     <string name="label_sign">Signieren</string>
     <string name="label_message">Nachricht</string>
     <string name="label_file">Datei</string>
-
     <string name="label_passPhrase">Passwort</string>
     <string name="label_passPhraseAgain">Wiederholen</string>
     <string name="label_algorithm">Algorithmus</string>
     <string name="label_asciiArmour">ASCII Armor</string>
     <string name="label_selectPublicKeys">Öffentliche(r) Schlüssel</string>
-    <string name="label_deleteAfterEncryption">Nach erfolgter Verschlüsselung löschen</string>
-
-    <string name="label_deleteAfterDecryption">Nach erfolgter Entschlüsselung löschen</string>
+    <string name="label_deleteAfterEncryption">Nach Verschlüsselung löschen</string>
+    <string name="label_deleteAfterDecryption">Nach Entschlüsselung löschen</string>
     <string name="label_encryptionAlgorithm">Verschlüsselungs-Algorithmus</string>
     <string name="label_hashAlgorithm">Hash-Algorithmus</string>
     <string name="label_asymmetric">Öffentlicher Schlüssel</string>
     <string name="label_symmetric">Passwort</string>
     <string name="label_passPhraseCacheTtl">Passwort-Cache</string>
-
     <string name="label_messageCompression">Nachrichten-Kompression</string>
     <string name="label_fileCompression">Datei-Kompression</string>
 
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0657be1e7..484dfd9c4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-     
+
      Author: 359 <359@siol.com>
 -->
 
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 6fd8794ff..502352f6b 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -37,6 +37,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 import java.util.regex.Pattern;
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index 7ba0e912b..f103e9548 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -192,11 +192,10 @@ public class MainActivity extends BaseActivity {
                 message.setText("Read the warnings!\n\n" +
                                 "Changes:\n" +
                                 "* k9mail integration, k9mail beta build is available on the k9mail website\n" +
-                                "* support of other file managers (e.g. ASTRO)\n" +
-                                "* Slovenian translation (thanks, 359)\n" +
-                                "* new database, much faster, less memory usage\n" +
-                                "* defined Intents and content provider for other apps\n" +
-                                "* bugfixes\n" +
+                                "* German and Italian translation (thanks, cwoehrl and Fabrizio)\n" +
+                                "* new preferences GUI\n" +
+                                "* much smaller package\n" +
+                                "* signature bugfix\n" +
                                 "\n" +
                                 "WARNING: be careful editing your existing keys, as they " +
                                 "WILL be stripped of certificates right now.\n" +