471 files changed, 1722 insertions, 243 deletions

diff --git a/.gitignore b/.gitignore
index a1fa2dab4..afa9dfc45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,33 @@
+#Android specific
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+release.properties
+ant.properties
 *.class
 *.apk
-.metadata
\ No newline at end of file
+
+#Gradle
+.gradle
+build
+gradle.properties
+gradlew
+gradlew.bat
+gradle
+
+#Maven
+target
+pom.xml.*
+
+#Eclipse
+.project
+.classpath
+.settings
+.metadata
+
+#IntelliJ IDEA
+.idea
+*.iml
diff --git a/OpenPGP-Keychain-API-Demo/.gitignore b/OpenPGP-Keychain-API-Demo/.gitignore
index 2e423e1a3..afa9dfc45 100644
--- a/OpenPGP-Keychain-API-Demo/.gitignore
+++ b/OpenPGP-Keychain-API-Demo/.gitignore
@@ -1,23 +1,33 @@
-#Android generated
+#Android specific
 bin
 gen
 obj
 libs/armeabi
 lint.xml
 local.properties
+release.properties
+ant.properties
+*.class
+*.apk
+
+#Gradle
+.gradle
+build
+gradle.properties
+gradlew
+gradlew.bat
+gradle
+
+#Maven
+target
+pom.xml.*
 
 #Eclipse
 .project
 .classpath
 .settings
+.metadata
 
 #IntelliJ IDEA
 .idea
 *.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
index 1cf132904..730ddd274 100644
--- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
@@ -28,6 +28,10 @@
             android:label="Intent Demo 1"
             android:windowSoftInputMode="stateHidden" />
         <activity
+            android:name=".CryptoProviderDemoActivity"
+            android:label="Crypto Provider"
+            android:windowSoftInputMode="stateHidden" />
+        <activity
             android:name=".AidlDemoActivity"
             android:label="Aidl Demo (ACCESS_API permission)"
             android:windowSoftInputMode="stateHidden" />
diff --git a/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
new file mode 100644
index 000000000..447734a52
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/res/layout/crypto_provider_demo.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <Button
+            android:id="@+id/crypto_provider_demo_register"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="registerCryptoProvider"
+            android:text="Register crypto provider" />
+
+        <Button
+            android:id="@+id/aidl_demo_select_secret_key"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="selectSecretKeyOnClick"
+            android:text="Select secret key" />
+
+        <Button
+            android:id="@+id/aidl_demo_select_encryption_key"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="selectEncryptionKeysOnClick"
+            android:text="Select encryption key(s)" />
+
+        <EditText
+            android:id="@+id/aidl_demo_message"
+            android:layout_width="match_parent"
+            android:layout_height="150dip"
+            android:text="message"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <EditText
+            android:id="@+id/aidl_demo_ciphertext"
+            android:layout_width="match_parent"
+            android:layout_height="150dip"
+            android:text="ciphertext"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+
+        <Button
+            android:id="@+id/aidl_demo_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="encryptOnClick"
+            android:text="Encrypt" />
+
+        <Button
+            android:id="@+id/aidl_demo_decrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="decryptOnClick"
+            android:text="Decrypt" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="APG Data:" />
+
+        <TextView
+            android:id="@+id/aidl_demo_data"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:minLines="10" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
index c9a34efd1..7e312ddf3 100644
--- a/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
@@ -19,5 +19,10 @@
             android:key="aidl_demo2"
             android:title="AIDL Demo (ACCESS_KEYS permission)" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="Crypto Provider" >
+        <Preference
+            android:key="crypto_provider_demo"
+            android:title="Crypto Provider" />
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
index 322a446b5..aa34fdebe 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
@@ -30,6 +30,7 @@ public class BaseActivity extends PreferenceActivity {
 
     private Preference mIntentDemo;
     private Preference mContentProviderDemo;
+    private Preference mCryptoProvider;
     private Preference mAidlDemo;
     private Preference mAidlDemo2;
 
@@ -48,6 +49,7 @@ public class BaseActivity extends PreferenceActivity {
         // find preferences
         mIntentDemo = (Preference) findPreference("intent_demo");
         mContentProviderDemo = (Preference) findPreference("content_provider_demo");
+        mCryptoProvider = (Preference) findPreference("crypto_provider_demo");
         mAidlDemo = (Preference) findPreference("aidl_demo");
         mAidlDemo2 = (Preference) findPreference("aidl_demo2");
 
@@ -68,6 +70,15 @@ public class BaseActivity extends PreferenceActivity {
                 return false;
             }
         });
+        
+        mCryptoProvider.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startActivity(new Intent(mActivity, CryptoProviderDemoActivity.class));
+
+                return false;
+            }
+        });
 
         mAidlDemo.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
diff --git a/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
new file mode 100644
index 000000000..b915e2a76
--- /dev/null
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/CryptoProviderDemoActivity.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package org.sufficientlysecure.keychain.demo;
+
+import org.sufficientlysecure.keychain.demo.R;
+import org.sufficientlysecure.keychain.integration.Constants;
+import org.sufficientlysecure.keychain.integration.KeychainData;
+import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
+import org.sufficientlysecure.keychain.service.IKeychainApiService;
+import org.sufficientlysecure.keychain.service.IKeychainKeyService;
+import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class CryptoProviderDemoActivity extends Activity {
+    Activity mActivity;
+
+    TextView mMessageTextView;
+    TextView mCiphertextTextView;
+    TextView mDataTextView;
+
+    KeychainIntentHelper mKeychainIntentHelper;
+    KeychainData mKeychainData;
+
+    private IKeychainApiService service = null;
+    private ServiceConnection svcConn = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder binder) {
+            service = IKeychainApiService.Stub.asInterface(binder);
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            service = null;
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.crypto_provider_demo);
+
+        mActivity = this;
+
+        mMessageTextView = (TextView) findViewById(R.id.aidl_demo_message);
+        mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext);
+        mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
+
+        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
+        mKeychainData = new KeychainData();
+
+        bindService(new Intent(IKeychainApiService.class.getName()), svcConn,
+                Context.BIND_AUTO_CREATE);
+    }
+
+    public void registerCryptoProvider(View view) {
+        try {
+            startActivityForResult(Intent.createChooser(new Intent("com.android.crypto.REGISTER"),
+                    "select crypto provider"), 123);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(mActivity, "No app that handles com.android.crypto.REGISTER!",
+                    Toast.LENGTH_LONG).show();
+            Log.e(Constants.TAG, "No app that handles com.android.crypto.REGISTER!");
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == 123) {
+            if (resultCode == RESULT_OK) {
+                String packageName = data.getStringExtra("packageName");
+                Log.d(Constants.TAG, "packageName: " + packageName);
+            }
+        }
+
+        // boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
+        // mKeychainData);
+        // if (result) {
+        // updateView();
+        // }
+
+        // continue with other activity results
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    public void encryptOnClick(View view) {
+        byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
+
+        try {
+            service.encryptAsymmetric(inputBytes, null, true, 0, mKeychainData.getPublicKeys(), 7,
+                    encryptHandler);
+        } catch (RemoteException e) {
+            exceptionImplementation(-1, e.toString());
+        }
+    }
+
+    public void decryptOnClick(View view) {
+        byte[] inputBytes = mCiphertextTextView.getText().toString().getBytes();
+
+        try {
+            service.decryptAndVerifyAsymmetric(inputBytes, null, null, decryptHandler);
+        } catch (RemoteException e) {
+            exceptionImplementation(-1, e.toString());
+        }
+    }
+
+    private void updateView() {
+        if (mKeychainData.getDecryptedData() != null) {
+            mMessageTextView.setText(mKeychainData.getDecryptedData());
+        }
+        if (mKeychainData.getEncryptedData() != null) {
+            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
+        }
+        mDataTextView.setText(mKeychainData.toString());
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        unbindService(svcConn);
+    }
+
+    private void exceptionImplementation(int exceptionId, String error) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
+    }
+
+    private final IKeychainEncryptHandler.Stub encryptHandler = new IKeychainEncryptHandler.Stub() {
+
+        @Override
+        public void onException(final int exceptionId, final String message) throws RemoteException {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    exceptionImplementation(exceptionId, message);
+                }
+            });
+        }
+
+        @Override
+        public void onSuccess(final byte[] outputBytes, String outputUri) throws RemoteException {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    mKeychainData.setEncryptedData(new String(outputBytes));
+                    updateView();
+                }
+            });
+        }
+
+    };
+
+    private final IKeychainDecryptHandler.Stub decryptHandler = new IKeychainDecryptHandler.Stub() {
+
+        @Override
+        public void onException(final int exceptionId, final String message) throws RemoteException {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    exceptionImplementation(exceptionId, message);
+                }
+            });
+        }
+
+        @Override
+        public void onSuccess(final byte[] outputBytes, String outputUri, boolean signature,
+                long signatureKeyId, String signatureUserId, boolean signatureSuccess,
+                boolean signatureUnknown) throws RemoteException {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    mKeychainData.setDecryptedData(new String(outputBytes));
+                    updateView();
+                }
+            });
+
+        }
+
+    };
+
+    private final IKeychainGetDecryptionKeyIdHandler.Stub helperHandler = new IKeychainGetDecryptionKeyIdHandler.Stub() {
+
+        @Override
+        public void onException(final int exceptionId, final String message) throws RemoteException {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    exceptionImplementation(exceptionId, message);
+                }
+            });
+        }
+
+        @Override
+        public void onSuccess(long arg0, boolean arg1) throws RemoteException {
+            // TODO Auto-generated method stub
+
+        }
+
+    };
+
+    /**
+     * Selection is done with Intents, not AIDL!
+     * 
+     * @param view
+     */
+    public void selectSecretKeyOnClick(View view) {
+        mKeychainIntentHelper.selectSecretKey();
+    }
+
+    public void selectEncryptionKeysOnClick(View view) {
+        mKeychainIntentHelper.selectPublicKeys("user@example.com");
+
+    }
+
+}
diff --git a/OpenPGP-Keychain-API-Lib/.gitignore b/OpenPGP-Keychain-API-Lib/.gitignore
index 2e423e1a3..afa9dfc45 100644
--- a/OpenPGP-Keychain-API-Lib/.gitignore
+++ b/OpenPGP-Keychain-API-Lib/.gitignore
@@ -1,23 +1,33 @@
-#Android generated
+#Android specific
 bin
 gen
 obj
 libs/armeabi
 lint.xml
 local.properties
+release.properties
+ant.properties
+*.class
+*.apk
+
+#Gradle
+.gradle
+build
+gradle.properties
+gradlew
+gradlew.bat
+gradle
+
+#Maven
+target
+pom.xml.*
 
 #Eclipse
 .project
 .classpath
 .settings
+.metadata
 
 #IntelliJ IDEA
 .idea
 *.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
diff --git a/OpenPGP-Keychain/.gitignore b/OpenPGP-Keychain/.gitignore
index 1eb5cbeae..afa9dfc45 100644
--- a/OpenPGP-Keychain/.gitignore
+++ b/OpenPGP-Keychain/.gitignore
@@ -1,24 +1,33 @@
-#Android generated
+#Android specific
 bin
 gen
 obj
 libs/armeabi
 lint.xml
 local.properties
+release.properties
 ant.properties
+*.class
+*.apk
+
+#Gradle
+.gradle
+build
+gradle.properties
+gradlew
+gradlew.bat
+gradle
+
+#Maven
+target
+pom.xml.*
 
 #Eclipse
 .project
 .classpath
 .settings
+.metadata
 
 #IntelliJ IDEA
 .idea
 *.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 7b02d6fae..d75350048 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -86,9 +86,7 @@
         android:permissionGroup="org.sufficientlysecure.keychain.permission-group.keychain"
         android:protectionLevel="dangerous" />
 
-    <!-- 
-        android:allowBackup="false": Don't allow backup over adb backup or other apps!
-    -->
+    <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! -->
     <application
         android:name=".KeychainApplication"
         android:allowBackup="false"
@@ -408,7 +406,10 @@
             android:name=".ui.HelpActivity"
             android:label="@string/title_help" />
 
-        <service android:name=".service.PassphraseCacheService" />
+        <service
+            android:name=".service.PassphraseCacheService"
+            android:exported="false"
+            android:process=":passphrase_cache" />
         <service android:name="org.sufficientlysecure.keychain.service.KeychainIntentService" />
         <service
             android:name="org.sufficientlysecure.keychain.service.KeychainApiService"
@@ -454,6 +455,44 @@
             android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider"
             android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
             android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
+
+        <!-- Crypto Provider other intents -->
+        <activity
+            android:name=".crypto_provider.CryptoActivity"
+            android:label="TODO crypto activity"
+            android:process=":crypto" >
+            <intent-filter>
+                <action android:name="org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <!-- Crypto Provider API -->
+        <activity
+            android:name=".crypto_provider.RegisterActivity"
+            android:label="TODO reg"
+            android:process=":crypto" >
+            <intent-filter>
+                <action android:name="com.android.crypto.REGISTER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name="org.sufficientlysecure.keychain.crypto_provider.CryptoService"
+            android:enabled="true"
+            android:exported="true"
+            android:process=":crypto" >
+            <intent-filter>
+                <action android:name="com.android.crypto.ICryptoService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="api_version"
+                android:value="1" />
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
new file mode 100644
index 000000000..ec8e07cbd
--- /dev/null
+++ b/OpenPGP-Keychain/build.gradle
@@ -0,0 +1,63 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4.1'
+    }
+}
+
+apply plugin: 'android'
+
+dependencies {
+    compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar'])
+    compile project(':libraries:ActionBarSherlock')
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "17"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 17
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+
+        instrumentTest.setRoot('tests')
+    }
+
+    /*
+     * To sign release build, create file gradle.properties in .gradle/ with this content:
+     *
+     * signingStoreLocation=/home/key.store
+     * signingStorePassword=xxx
+     * signingKeyAlias=alias
+     * signingKeyPassword=xxx
+     */
+    signingConfigs {
+        myConfig {
+            storeFile file(signingStoreLocation)
+            storePassword signingStorePassword
+            keyAlias signingKeyAlias
+            keyPassword signingKeyPassword
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.myConfig
+        }
+    }
+}
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar b/OpenPGP-Keychain/libs/android-support-v4.jar
index 99e063b33..99e063b33 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar
+++ b/OpenPGP-Keychain/libs/android-support-v4.jar
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
index 2267fbaf8..cfb577df7 100644
--- a/OpenPGP-Keychain/project.properties
+++ b/OpenPGP-Keychain/project.properties
@@ -9,4 +9,4 @@
 
 # Project target.
 target=android-17
-android.library.reference.1=android-libs/ActionBarSherlock
+android.library.reference.1=../libraries/ActionBarSherlock
diff --git a/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml b/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml
new file mode 100644
index 000000000..24a64f1ac
--- /dev/null
+++ b/OpenPGP-Keychain/res/layout/register_crypto_consumer_activity.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Register?" />
+
+    <Button
+        android:id="@+id/register_crypto_consumer_allow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Allow access" />
+
+    <Button
+        android:id="@+id/register_crypto_consumer_disallow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Disallow" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl b/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
new file mode 100644
index 000000000..d1b941212
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+ 
+package com.android.crypto;
+
+// Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable CryptoError;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java b/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
new file mode 100644
index 000000000..9540f4f68
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package com.android.crypto;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class CryptoError implements Parcelable {
+    int errorId;
+    String message;
+
+    public CryptoError() {
+    }
+
+    public CryptoError(int errorId, String message) {
+        this.errorId = errorId;
+        this.message = message;
+    }
+
+    public CryptoError(CryptoError b) {
+        this.errorId = b.errorId;
+        this.message = b.message;
+    }
+
+    public int getErrorId() {
+        return errorId;
+    }
+
+    public void setErrorId(int errorId) {
+        this.errorId = errorId;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(errorId);
+        dest.writeString(message);
+    }
+
+    public static final Creator<CryptoError> CREATOR = new Creator<CryptoError>() {
+        public CryptoError createFromParcel(final Parcel source) {
+            CryptoError error = new CryptoError();
+            error.errorId = source.readInt();
+            error.message = source.readString();
+            return error;
+        }
+
+        public CryptoError[] newArray(final int size) {
+            return new CryptoError[size];
+        }
+    };
+}
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
new file mode 100644
index 000000000..4d659d344
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
@@ -0,0 +1,73 @@
+package com.android.crypto;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.util.Log;
+
+public class CryptoServiceConnection {
+    private Context mApplicationContext;
+
+    private ICryptoService mService;
+    private boolean bound;
+    private String cryptoProviderPackageName;
+
+    private static final String TAG = "CryptoConnection";
+
+    public CryptoServiceConnection(Context context, String cryptoProviderPackageName) {
+        mApplicationContext = context.getApplicationContext();
+        this.cryptoProviderPackageName = cryptoProviderPackageName;
+    }
+
+    public ICryptoService getService() {
+        return mService;
+    }
+
+    private ServiceConnection mCryptoServiceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = ICryptoService.Stub.asInterface(service);
+            Log.d(TAG, "connected to service");
+            bound = true;
+        }
+
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+            Log.d(TAG, "disconnected from service");
+            bound = false;
+        }
+    };
+
+    /**
+     * If not already bound, bind!
+     * 
+     * @return
+     */
+    public boolean bindToService() {
+        if (mService == null && !bound) { // if not already connected
+            try {
+                Log.d(TAG, "not bound yet");
+
+                Intent serviceIntent = new Intent();
+                serviceIntent.setAction("com.android.crypto.ICryptoService");
+                serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
+                mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
+                        Context.BIND_AUTO_CREATE);
+
+                return true;
+            } catch (Exception e) {
+                Log.d(TAG, "Exception", e);
+                return false;
+            }
+        } else { // already connected
+            Log.d(TAG, "already bound... ");
+            return true;
+        }
+    }
+
+    public void unbindFromService() {
+        mApplicationContext.unbindService(mCryptoServiceConnection);
+    }
+
+}
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl b/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
new file mode 100644
index 000000000..21862c497
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+ 
+package com.android.crypto;
+
+// Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
+parcelable CryptoSignatureResult;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java b/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
new file mode 100644
index 000000000..87f5f43b5
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package com.android.crypto;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class CryptoSignatureResult implements Parcelable {
+    String signatureUserId;
+
+    boolean signature;
+    boolean signatureSuccess;
+    boolean signatureUnknown;
+
+    public CryptoSignatureResult() {
+
+    }
+
+    public CryptoSignatureResult(String signatureUserId, boolean signature,
+            boolean signatureSuccess, boolean signatureUnknown) {
+        this.signatureUserId = signatureUserId;
+
+        this.signature = signature;
+        this.signatureSuccess = signatureSuccess;
+        this.signatureUnknown = signatureUnknown;
+    }
+
+    public CryptoSignatureResult(CryptoSignatureResult b) {
+        this.signatureUserId = b.signatureUserId;
+
+        this.signature = b.signature;
+        this.signatureSuccess = b.signatureSuccess;
+        this.signatureUnknown = b.signatureUnknown;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(signatureUserId);
+
+        dest.writeByte((byte) (signature ? 1 : 0));
+        dest.writeByte((byte) (signatureSuccess ? 1 : 0));
+        dest.writeByte((byte) (signatureUnknown ? 1 : 0));
+    }
+
+    public static final Creator<CryptoSignatureResult> CREATOR = new Creator<CryptoSignatureResult>() {
+        public CryptoSignatureResult createFromParcel(final Parcel source) {
+            CryptoSignatureResult vr = new CryptoSignatureResult();
+            vr.signatureUserId = source.readString();
+            vr.signature = source.readByte() == 1;
+            vr.signatureSuccess = source.readByte() == 1;
+            vr.signatureUnknown = source.readByte() == 1;
+            return vr;
+        }
+
+        public CryptoSignatureResult[] newArray(final int size) {
+            return new CryptoSignatureResult[size];
+        }
+    };
+}
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
new file mode 100644
index 000000000..af6587c04
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package com.android.crypto;
+
+import com.android.crypto.CryptoSignatureResult;
+import com.android.crypto.CryptoError;
+
+interface ICryptoCallback {
+
+    oneway void onEncryptSignSuccess(in byte[] outputBytes);
+    
+    oneway void onDecryptVerifySuccess(in byte[] outputBytes, in CryptoSignatureResult signatureResult);
+
+
+    oneway void onError(in CryptoError error);
+    
+    oneway void onActivityRequired(in Intent intent);
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
new file mode 100644
index 000000000..05baa16e0
--- /dev/null
+++ b/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+ 
+package com.android.crypto;
+
+import com.android.crypto.ICryptoCallback;
+
+/**
+ * All methods are oneway, which means they are asynchronous and non-blocking.
+ * Results are returned to the callback, which has to be implemented on client side.
+ */
+interface ICryptoService {
+       
+    /**
+     * Encrypt
+     * 
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param encryptionKeyIds
+     *            Ids of public keys used for encryption
+     * @param handler
+     *            Results are returned to this Handler after successful encryption
+     */
+    oneway void encrypt(in byte[] inputBytes, in String[] encryptionUserIds, in ICryptoCallback callback);
+    
+    /**
+     * Encrypt and sign
+     *
+     * 
+     * 
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param signatureKeyId
+     *            Key id of key to sign with
+     * @param handler
+     *            Results are returned to this Handler after successful encryption and signing
+     */
+    oneway void encryptAndSign(in byte[] inputBytes, in String[] encryptionUserIds, String signatureUserId, in ICryptoCallback callback);
+    
+    /**
+     * Sign
+     *
+     * 
+     * 
+     * @param inputBytes
+     *            Byte array you want to encrypt
+     * @param signatureId
+     *            
+     * @param handler
+     *            Results are returned to this Handler after successful encryption and signing
+     */
+    oneway void sign(in byte[] inputBytes, String signatureUserId, in ICryptoCallback callback);
+    
+    /**
+     * Decrypts and verifies given input bytes. If no signature is present this method
+     * will only decrypt.
+     * 
+     * @param inputBytes
+     *            Byte array you want to decrypt and verify
+     * @param handler
+     *            Handler where to return results to after successful encryption
+     */
+    oneway void decryptAndVerify(in byte[] inputBytes, in ICryptoCallback callback);    
+    
+}
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
new file mode 100644
index 000000000..b1d248e42
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
@@ -0,0 +1,92 @@
+package org.sufficientlysecure.keychain.crypto_provider;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class CryptoActivity extends SherlockFragmentActivity {
+
+    public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE";
+
+    public static final String EXTRA_SECRET_KEY_ID = "secret_key_id";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        handleActions(getIntent());
+    }
+
+    protected void handleActions(Intent intent) {
+
+        // TODO: Important: Check if calling package is in list!
+
+        String action = intent.getAction();
+        Bundle extras = intent.getExtras();
+
+        if (extras == null) {
+            extras = new Bundle();
+        }
+
+        /**
+         * com.android.crypto actions
+         */
+        if (ACTION_CACHE_PASSPHRASE.equals(action)) {
+            long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID);
+
+            showPassphraseDialog(secretKeyId);
+        } else {
+            Log.e(Constants.TAG, "Wrong action!");
+            setResult(RESULT_CANCELED);
+            finish();
+        }
+    }
+
+    /**
+     * Shows passphrase dialog to cache a new passphrase the user enters for using it later for
+     * encryption. Based on mSecretKeyId it asks for a passphrase to open a private key or it asks
+     * for a symmetric passphrase
+     */
+    private void showPassphraseDialog(long secretKeyId) {
+        // Message is received after passphrase is cached
+        Handler returnHandler = new Handler() {
+            @Override
+            public void handleMessage(Message message) {
+                if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
+                    setResult(RESULT_OK);
+                    finish();
+                }
+            }
+        };
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(returnHandler);
+
+        try {
+            PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance(this,
+                    messenger, secretKeyId);
+
+            passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
+        } catch (PgpMain.PgpGeneralException e) {
+            Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
+            // send message to handler to start encryption directly
+            returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
+        }
+    }
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
new file mode 100644
index 000000000..1a57a457d
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package org.sufficientlysecure.keychain.crypto_provider;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.util.InputData;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+
+import com.android.crypto.CryptoError;
+import com.android.crypto.ICryptoCallback;
+import com.android.crypto.ICryptoService;
+import com.android.crypto.CryptoSignatureResult;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+public class CryptoService extends Service {
+    Context mContext;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mContext = this;
+        Log.d(Constants.TAG, "CryptoService, onCreate()");
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(Constants.TAG, "CryptoService, onDestroy()");
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    private synchronized void decryptAndVerifySafe(byte[] inputBytes, ICryptoCallback callback)
+            throws RemoteException {
+        try {
+            // build InputData and write into OutputStream
+            InputStream inputStream = new ByteArrayInputStream(inputBytes);
+            long inputLength = inputBytes.length;
+            InputData inputData = new InputData(inputStream, inputLength);
+
+            OutputStream outputStream = new ByteArrayOutputStream();
+
+            long secretKeyId = PgpMain.getDecryptionKeyId(mContext, inputStream);
+            if (secretKeyId == Id.key.none) {
+                throw new PgpMain.PgpGeneralException(getString(R.string.error_noSecretKeyFound));
+            }
+            
+            Log.d(Constants.TAG, "Got input:\n"+new String(inputBytes));
+
+            Log.d(Constants.TAG, "secretKeyId " + secretKeyId);
+
+            String passphrase = PassphraseCacheService.getCachedPassphrase(mContext, secretKeyId);
+
+            if (passphrase == null) {
+                Log.d(Constants.TAG, "No passphrase! Activity required!");
+                // No passphrase cached for this ciphertext! Intent required to cache
+                // passphrase!
+                Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
+                intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
+                callback.onActivityRequired(intent);
+                return;
+            }
+
+            // if (signedOnly) {
+            // resultData = PgpMain.verifyText(this, this, inputData, outStream,
+            // lookupUnknownKey);
+            // } else {
+            // resultData = PgpMain.decryptAndVerify(this, this, inputData, outStream,
+            // PassphraseCacheService.getCachedPassphrase(this, secretKeyId),
+            // assumeSymmetricEncryption);
+            // }
+
+            Bundle outputBundle = PgpMain.decryptAndVerify(mContext, null, inputData, outputStream,
+                    passphrase, false);
+
+            outputStream.close();
+
+            byte[] outputBytes = ((ByteArrayOutputStream) outputStream).toByteArray();
+
+            // get signature informations from bundle
+            boolean signature = outputBundle.getBoolean(KeychainIntentService.RESULT_SIGNATURE);
+            long signatureKeyId = outputBundle
+                    .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
+            String signatureUserId = outputBundle
+                    .getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
+            boolean signatureSuccess = outputBundle
+                    .getBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS);
+            boolean signatureUnknown = outputBundle
+                    .getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN);
+
+            CryptoSignatureResult sigResult = new CryptoSignatureResult(signatureUserId, signature,
+                    signatureSuccess, signatureUnknown);
+
+            // return over handler on client side
+            callback.onDecryptVerifySuccess(outputBytes, sigResult);
+        } catch (Exception e) {
+            Log.e(Constants.TAG, "KeychainService, Exception!", e);
+
+            try {
+                callback.onError(new CryptoError(0, e.getMessage()));
+            } catch (Exception t) {
+                Log.e(Constants.TAG, "Error returning exception to client", t);
+            }
+        }
+    }
+
+    private final ICryptoService.Stub mBinder = new ICryptoService.Stub() {
+
+        @Override
+        public void encrypt(byte[] inputBytes, String[] encryptionUserIds, ICryptoCallback callback)
+                throws RemoteException {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void encryptAndSign(byte[] inputBytes, String[] encryptionUserIds,
+                String signatureUserId, ICryptoCallback callback) throws RemoteException {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void sign(byte[] inputBytes, String signatureUserId, ICryptoCallback callback)
+                throws RemoteException {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void decryptAndVerify(byte[] inputBytes, ICryptoCallback callback)
+                throws RemoteException {
+            decryptAndVerifySafe(inputBytes, callback);
+        }
+
+    };
+
+    // /**
+    // * As we can not throw an exception through Android RPC, we assign identifiers to the
+    // exception
+    // * types.
+    // *
+    // * @param e
+    // * @return
+    // */
+    // private int getExceptionId(Exception e) {
+    // if (e instanceof NoSuchProviderException) {
+    // return 0;
+    // } else if (e instanceof NoSuchAlgorithmException) {
+    // return 1;
+    // } else if (e instanceof SignatureException) {
+    // return 2;
+    // } else if (e instanceof IOException) {
+    // return 3;
+    // } else if (e instanceof PgpGeneralException) {
+    // return 4;
+    // } else if (e instanceof PGPException) {
+    // return 5;
+    // } else {
+    // return -1;
+    // }
+    // }
+
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java
new file mode 100644
index 000000000..39b29f9a0
--- /dev/null
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/RegisterActivity.java
@@ -0,0 +1,74 @@
+package org.sufficientlysecure.keychain.crypto_provider;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.util.Log;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class RegisterActivity extends Activity {
+
+    public static final String ACTION_REGISTER = "com.android.crypto.REGISTER";
+
+    public static final String EXTRA_PACKAGE_NAME = "packageName";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        handleActions(getIntent());
+    }
+
+    protected void handleActions(Intent intent) {
+        String action = intent.getAction();
+        Bundle extras = intent.getExtras();
+
+        if (extras == null) {
+            extras = new Bundle();
+        }
+
+        final String callingPackageName = this.getCallingPackage();
+
+        /**
+         * com.android.crypto actions
+         */
+        if (ACTION_REGISTER.equals(action)) {
+            setContentView(R.layout.register_crypto_consumer_activity);
+
+            Button allowButton = (Button) findViewById(R.id.register_crypto_consumer_allow);
+            Button disallowButton = (Button) findViewById(R.id.register_crypto_consumer_disallow);
+
+            allowButton.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    ProviderHelper.addCryptoConsumer(RegisterActivity.this, callingPackageName);
+                    Intent data = new Intent();
+                    data.putExtra(EXTRA_PACKAGE_NAME, "org.sufficientlysecure.keychain");
+
+                    setResult(RESULT_OK, data);
+                    finish();
+                }
+            });
+
+            disallowButton.setOnClickListener(new OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    setResult(RESULT_CANCELED);
+                    finish();
+                }
+            });
+
+        } else {
+            Log.e(Constants.TAG, "Please use com.android.crypto.REGISTER as intent action!");
+            finish();
+        }
+    }
+}
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index b284eccaa..46928c6fa 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -53,6 +53,10 @@ public class KeychainContract {
         String RANK = "rank";
     }
 
+    interface CryptoConsumersColumns {
+        String PACKAGE_NAME = "package_name";
+    }
+
     public static final class KeyTypes {
         public static final int PUBLIC = 0;
         public static final int SECRET = 1;
@@ -78,6 +82,8 @@ public class KeychainContract {
     public static final String PATH_USER_IDS = "user_ids";
     public static final String PATH_KEYS = "keys";
 
+    public static final String BASE_CRYPTO_CONSUMERS = "crypto_consumers";
+
     public static class KeyRings implements KeyRingsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
                 .appendPath(BASE_KEY_RINGS).build();
@@ -207,6 +213,17 @@ public class KeychainContract {
         }
     }
 
+    public static class CryptoConsumers implements CryptoConsumersColumns, BaseColumns {
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
+                .appendPath(BASE_CRYPTO_CONSUMERS).build();
+
+        /** Use if multiple items get returned */
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.crypto_consumers";
+
+        /** Use if a single item is returned */
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.crypto_consumers";
+    }
+
     public static class DataStream {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
                 .appendPath(BASE_DATA).build();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index ef95ce7f7..f30292b52 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -18,6 +18,7 @@
 package org.sufficientlysecure.keychain.provider;
 
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumersColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeysColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIdsColumns;
@@ -28,15 +29,15 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 
-
 public class KeychainDatabase extends SQLiteOpenHelper {
     private static final String DATABASE_NAME = "apg.db";
-    private static final int DATABASE_VERSION = 4;
+    private static final int DATABASE_VERSION = 5;
 
     public interface Tables {
         String KEY_RINGS = "key_rings";
         String KEYS = "keys";
         String USER_IDS = "user_ids";
+        String CRYPTO_CONSUMERS = "crypto_consumers";
     }
 
     private static final String CREATE_KEY_RINGS = "CREATE TABLE IF NOT EXISTS " + Tables.KEY_RINGS
@@ -48,13 +49,13 @@ public class KeychainDatabase extends SQLiteOpenHelper {
             + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + KeysColumns.KEY_ID
             + " INT64, " + KeysColumns.TYPE + " INTEGER, " + KeysColumns.IS_MASTER_KEY
             + " INTEGER, " + KeysColumns.ALGORITHM + " INTEGER, " + KeysColumns.KEY_SIZE
-            + " INTEGER, " + KeysColumns.CAN_CERTIFY
-            + " INTEGER, " + KeysColumns.CAN_SIGN + " INTEGER, " + KeysColumns.CAN_ENCRYPT
-            + " INTEGER, " + KeysColumns.IS_REVOKED + " INTEGER, " + KeysColumns.CREATION
-            + " INTEGER, " + KeysColumns.EXPIRY + " INTEGER, " + KeysColumns.KEY_DATA + " BLOB,"
-            + KeysColumns.RANK + " INTEGER, " + KeysColumns.KEY_RING_ROW_ID
-            + " INTEGER NOT NULL, FOREIGN KEY(" + KeysColumns.KEY_RING_ROW_ID + ") REFERENCES "
-            + Tables.KEY_RINGS + "(" + BaseColumns._ID + ") ON DELETE CASCADE)";
+            + " INTEGER, " + KeysColumns.CAN_CERTIFY + " INTEGER, " + KeysColumns.CAN_SIGN
+            + " INTEGER, " + KeysColumns.CAN_ENCRYPT + " INTEGER, " + KeysColumns.IS_REVOKED
+            + " INTEGER, " + KeysColumns.CREATION + " INTEGER, " + KeysColumns.EXPIRY
+            + " INTEGER, " + KeysColumns.KEY_DATA + " BLOB," + KeysColumns.RANK + " INTEGER, "
+            + KeysColumns.KEY_RING_ROW_ID + " INTEGER NOT NULL, FOREIGN KEY("
+            + KeysColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "("
+            + BaseColumns._ID + ") ON DELETE CASCADE)";
 
     private static final String CREATE_USER_IDS = "CREATE TABLE IF NOT EXISTS " + Tables.USER_IDS
             + " (" + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
@@ -63,6 +64,11 @@ public class KeychainDatabase extends SQLiteOpenHelper {
             + UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "("
             + BaseColumns._ID + ") ON DELETE CASCADE)";
 
+    private static final String CREATE_CRYPTO_CONSUMERS = "CREATE TABLE IF NOT EXISTS "
+            + Tables.CRYPTO_CONSUMERS + " (" + BaseColumns._ID
+            + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CryptoConsumersColumns.PACKAGE_NAME
+            + " TEXT UNIQUE)";
+
     KeychainDatabase(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -74,6 +80,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
         db.execSQL(CREATE_KEY_RINGS);
         db.execSQL(CREATE_KEYS);
         db.execSQL(CREATE_USER_IDS);
+        db.execSQL(CREATE_CRYPTO_CONSUMERS);
     }
 
     @Override
@@ -95,9 +102,13 @@ public class KeychainDatabase extends SQLiteOpenHelper {
 
             switch (version) {
             case 3:
-                db.execSQL("ALTER TABLE " + Tables.KEYS + " ADD COLUMN " + KeysColumns.CAN_CERTIFY + " INTEGER DEFAULT 0;");
-                db.execSQL("UPDATE " + Tables.KEYS + " SET " + KeysColumns.CAN_CERTIFY + " = 1 WHERE " + KeysColumns.IS_MASTER_KEY + "= 1;");
+                db.execSQL("ALTER TABLE " + Tables.KEYS + " ADD COLUMN " + KeysColumns.CAN_CERTIFY
+                        + " INTEGER DEFAULT 0;");
+                db.execSQL("UPDATE " + Tables.KEYS + " SET " + KeysColumns.CAN_CERTIFY
+                        + " = 1 WHERE " + KeysColumns.IS_MASTER_KEY + "= 1;");
                 break;
+            case 4:
+                db.execSQL(CREATE_CRYPTO_CONSUMERS);
 
             default:
                 break;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index c63d9e772..49286b9ce 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 
 import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyTypes;
@@ -80,7 +81,9 @@ public class KeychainProvider extends ContentProvider {
     private static final int SECRET_KEY_RING_USER_ID = 221;
     private static final int SECRET_KEY_RING_USER_ID_BY_ROW_ID = 222;
 
-    private static final int DATA_STREAM = 301;
+    private static final int CRYPTO_CONSUMERS = 301;
+
+    // private static final int DATA_STREAM = 401;
 
     protected boolean mInternalProvider;
     protected UriMatcher mUriMatcher;
@@ -126,8 +129,7 @@ public class KeychainProvider extends ContentProvider {
                 PUBLIC_KEY_RING_BY_EMAILS);
         matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/"
                 + KeychainContract.PATH_PUBLIC + "/" + KeychainContract.PATH_BY_EMAILS,
-                PUBLIC_KEY_RING_BY_EMAILS); // without emails
-        // specified
+                PUBLIC_KEY_RING_BY_EMAILS); // without emails specified
         matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/"
                 + KeychainContract.PATH_PUBLIC + "/" + KeychainContract.PATH_BY_LIKE_EMAIL + "/*",
                 PUBLIC_KEY_RING_BY_LIKE_EMAIL);
@@ -189,8 +191,7 @@ public class KeychainProvider extends ContentProvider {
                 SECRET_KEY_RING_BY_EMAILS);
         matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/"
                 + KeychainContract.PATH_SECRET + "/" + KeychainContract.PATH_BY_EMAILS,
-                SECRET_KEY_RING_BY_EMAILS); // without emails
-        // specified
+                SECRET_KEY_RING_BY_EMAILS); // without emails specified
         matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/"
                 + KeychainContract.PATH_SECRET + "/" + KeychainContract.PATH_BY_LIKE_EMAIL + "/*",
                 SECRET_KEY_RING_BY_LIKE_EMAIL);
@@ -226,13 +227,18 @@ public class KeychainProvider extends ContentProvider {
                 SECRET_KEY_RING_USER_ID_BY_ROW_ID);
 
         /**
+         * Crypto Consumers
+         */
+        matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS, CRYPTO_CONSUMERS);
+
+        /**
          * data stream
          * 
          * <pre>
          * data / _
          * </pre>
          */
-        matcher.addURI(authority, KeychainContract.BASE_DATA + "/*", DATA_STREAM);
+        // matcher.addURI(authority, KeychainContract.BASE_DATA + "/*", DATA_STREAM);
 
         return matcher;
     }
@@ -284,6 +290,9 @@ public class KeychainProvider extends ContentProvider {
         case SECRET_KEY_RING_USER_ID_BY_ROW_ID:
             return UserIds.CONTENT_ITEM_TYPE;
 
+        case CRYPTO_CONSUMERS:
+            return CryptoConsumers.CONTENT_TYPE;
+
         default:
             throw new UnsupportedOperationException("Unknown uri: " + uri);
         }
@@ -591,6 +600,11 @@ public class KeychainProvider extends ContentProvider {
             qb.appendWhereEscapeString(uri.getLastPathSegment());
 
             break;
+            
+        case CRYPTO_CONSUMERS:
+            qb.setTables(Tables.CRYPTO_CONSUMERS);
+            
+            break;
 
         default:
             throw new IllegalArgumentException("Unknown URI " + uri);
@@ -869,16 +883,16 @@ public class KeychainProvider extends ContentProvider {
         return BaseColumns._ID + "=" + rowId + andForeignKeyRing + andSelection;
     }
 
-    @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        int match = mUriMatcher.match(uri);
-        if (match != DATA_STREAM) {
-            throw new FileNotFoundException();
-        }
-        String fileName = uri.getLastPathSegment();
-        File file = new File(getContext().getFilesDir().getAbsolutePath(), fileName);
-        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
-    }
+    // @Override
+    // public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+    // int match = mUriMatcher.match(uri);
+    // if (match != DATA_STREAM) {
+    // throw new FileNotFoundException();
+    // }
+    // String fileName = uri.getLastPathSegment();
+    // File file = new File(getContext().getFilesDir().getAbsolutePath(), fileName);
+    // return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+    // }
 
     /**
      * This broadcast is send system wide to inform other application that a keyring was inserted,
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 2665456ea..57d3b54d6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -31,6 +31,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
 import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
@@ -516,10 +517,13 @@ public class ProviderHelper {
      * @return
      */
     private static boolean getMasterKeyCanSign(Context context, Uri queryUri, long keyRingRowId) {
-        String[] projection = new String[] { KeyRings.MASTER_KEY_ID, "(SELECT COUNT(sign_keys." + 
-            Keys._ID + ") FROM " + Tables.KEYS + " AS sign_keys WHERE sign_keys." + Keys.KEY_RING_ROW_ID + " = "
-            + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND sign_keys."
-            + Keys.CAN_SIGN + " = '1' AND " + Keys.IS_MASTER_KEY + " = 1) AS sign",  };
+        String[] projection = new String[] {
+                KeyRings.MASTER_KEY_ID,
+                "(SELECT COUNT(sign_keys." + Keys._ID + ") FROM " + Tables.KEYS
+                        + " AS sign_keys WHERE sign_keys." + Keys.KEY_RING_ROW_ID + " = "
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
+                        + " AND sign_keys." + Keys.CAN_SIGN + " = '1' AND " + Keys.IS_MASTER_KEY
+                        + " = 1) AS sign", };
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);
@@ -713,4 +717,31 @@ public class ProviderHelper {
 
         return cursor;
     }
+
+    public static ArrayList<String> getCryptoConsumers(Context context) {
+        Cursor cursor = context.getContentResolver().query(CryptoConsumers.CONTENT_URI, null, null,
+                null, null);
+
+        ArrayList<String> packageNames = new ArrayList<String>();
+        if (cursor != null) {
+            int packageNameCol = cursor.getColumnIndex(CryptoConsumers.PACKAGE_NAME);
+            if (cursor.moveToFirst()) {
+                do {
+                    packageNames.add(cursor.getString(packageNameCol));
+                } while (cursor.moveToNext());
+            }
+        }
+
+        if (cursor != null) {
+            cursor.close();
+        }
+
+        return packageNames;
+    }
+
+    public static void addCryptoConsumer(Context context, String packageName) {
+        ContentValues values = new ContentValues();
+        values.put(CryptoConsumers.PACKAGE_NAME, packageName);
+        context.getContentResolver().insert(CryptoConsumers.CONTENT_URI, values);
+    }
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 1d48278eb..711cdae24 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -56,7 +56,6 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 
-
 /**
  * This Service contains all important long lasting operations for APG. It receives Intents with
  * data from the activities or other apps, queues these intents, executes them, and stops itself
@@ -541,11 +540,12 @@ public class KeychainIntentService extends IntentService implements ProgressDial
 
                 /* Operation */
                 if (!canSign) {
-                    PgpMain.changeSecretKeyPassphrase(this, ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId), 
-                    oldPassPhrase, newPassPhrase, this);
+                    PgpMain.changeSecretKeyPassphrase(this,
+                            ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId),
+                            oldPassPhrase, newPassPhrase, this);
                 } else {
-                    PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase,
-                        newPassPhrase, this);
+                    PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId,
+                            oldPassPhrase, newPassPhrase, this);
                 }
                 PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase);
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index eb1232769..d11b8e92a 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2012-2013 Dominik Schürmann <dominik@dominikschuermann.de>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,12 @@ package org.sufficientlysecure.keychain.service;
 import java.util.Date;
 import java.util.HashMap;
 
+import org.spongycastle.openpgp.PGPException;
+import org.spongycastle.openpgp.PGPPrivateKey;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.helper.PgpHelper;
@@ -35,27 +39,39 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
 import android.util.Log;
 
 public class PassphraseCacheService extends Service {
     public static final String TAG = Constants.TAG + ": PassphraseCacheService";
 
+    public static final String ACTION_PASSPHRASE_CACHE_ADD = Constants.INTENT_PREFIX
+            + "PASSPHRASE_CACHE_ADD";
+    public static final String ACTION_PASSPHRASE_CACHE_GET = Constants.INTENT_PREFIX
+            + "PASSPHRASE_CACHE_GET";
+
     public static final String BROADCAST_ACTION_PASSPHRASE_CACHE_SERVICE = Constants.INTENT_PREFIX
-            + "PASSPHRASE_CACHE_SERVICE";
+            + "PASSPHRASE_CACHE_BROADCAST";
 
     public static final String EXTRA_TTL = "ttl";
     public static final String EXTRA_KEY_ID = "keyId";
     public static final String EXTRA_PASSPHRASE = "passphrase";
+    public static final String EXTRA_MESSENGER = "messenger";
 
     private static final int REQUEST_ID = 0;
     private static final long DEFAULT_TTL = 15;
 
     private BroadcastReceiver mIntentReceiver;
 
-    // This is static to be easily retrieved by getCachedPassphrase() without the need of callback
-    // functions
-    private static HashMap<Long, String> mPassphraseCache = new HashMap<Long, String>();
+    private HashMap<Long, String> mPassphraseCache = new HashMap<Long, String>();
+
+    Context mContext;
 
     /**
      * This caches a new passphrase by sending a new command to the service. An android service is
@@ -70,6 +86,7 @@ public class PassphraseCacheService extends Service {
         Log.d(TAG, "cacheNewPassphrase() for " + keyId);
 
         Intent intent = new Intent(context, PassphraseCacheService.class);
+        intent.setAction(ACTION_PASSPHRASE_CACHE_ADD);
         intent.putExtra(EXTRA_TTL, Preferences.getPreferences(context).getPassPhraseCacheTtl());
         intent.putExtra(EXTRA_PASSPHRASE, passphrase);
         intent.putExtra(EXTRA_KEY_ID, keyId);
@@ -78,17 +95,65 @@ public class PassphraseCacheService extends Service {
     }
 
     /**
-     * Gets a cached passphrase from memory
+     * Gets a cached passphrase from memory, blocking method
      * 
      * @param context
      * @param keyId
      * @return
      */
     public static String getCachedPassphrase(Context context, long keyId) {
+        Log.d(TAG, "getCachedPassphrase() get masterKeyId for " + keyId);
+        Intent intent = new Intent(context, PassphraseCacheService.class);
+        intent.setAction(ACTION_PASSPHRASE_CACHE_GET);
+
+        final Object mutex = new Object();
+        final Bundle returnBundle = new Bundle();
+
+        HandlerThread handlerThread = new HandlerThread("getPassphrase");
+        handlerThread.start();
+        Handler returnHandler = new Handler(handlerThread.getLooper()) {
+            @Override
+            public void handleMessage(Message message) {
+                if (message.obj != null) {
+                    String passphrase = ((Bundle) message.obj).getString(EXTRA_PASSPHRASE);
+                    returnBundle.putString(EXTRA_PASSPHRASE, passphrase);
+                }
+                synchronized (mutex) {
+                    mutex.notify();
+                }
+                getLooper().quit();
+            }
+        };
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(returnHandler);
+        intent.putExtra(EXTRA_KEY_ID, keyId);
+        intent.putExtra(EXTRA_MESSENGER, messenger);
+        // send intent to this service
+        context.startService(intent);
+
+        // Wait on mutex until passphrase is returned to handlerThread
+        synchronized (mutex) {
+            try {
+                mutex.wait(3000);
+            } catch (InterruptedException e) {
+            }
+        }
+
+        if (returnBundle.containsKey(EXTRA_PASSPHRASE)) {
+            return returnBundle.getString(EXTRA_PASSPHRASE);
+        } else {
+            return null;
+        }
+    }
+
+    private String getCachedPassphraseImpl(long keyId) {
+        Log.d(TAG, "getCachedPassphraseImpl() get masterKeyId for " + keyId);
+
         // try to get master key id which is used as an identifier for cached passphrases
         long masterKeyId = keyId;
         if (masterKeyId != Id.key.symmetric) {
-            PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByKeyId(context, keyId);
+            PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByKeyId(this, keyId);
             if (keyRing == null) {
                 return null;
             }
@@ -98,20 +163,60 @@ public class PassphraseCacheService extends Service {
             }
             masterKeyId = masterKey.getKeyID();
         }
+        Log.d(TAG, "getCachedPassphraseImpl() for masterKeyId" + masterKeyId);
 
         // get cached passphrase
         String cachedPassphrase = mPassphraseCache.get(masterKeyId);
         if (cachedPassphrase == null) {
+            // TODO: fix!
+            // check if secret key has a passphrase
+            // if (!hasPassphrase(context, masterKeyId)) {
+            // // cache empty passphrase
+            // addCachedPassphrase(context, masterKeyId, "");
+            // return "";
+            // } else {
             return null;
+            // }
         }
         // set it again to reset the cache life cycle
         Log.d(TAG, "Cache passphrase again when getting it!");
-        addCachedPassphrase(context, masterKeyId, cachedPassphrase);
+        addCachedPassphrase(this, masterKeyId, cachedPassphrase);
 
         return cachedPassphrase;
     }
 
     /**
+     * Checks if key has a passphrase.
+     * 
+     * @param secretKeyId
+     * @return true if it has a passphrase
+     */
+    public static boolean hasPassphrase(Context context, long secretKeyId) {
+        // check if the key has no passphrase
+        try {
+            PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper
+                    .getPGPSecretKeyRingByKeyId(context, secretKeyId));
+
+            Log.d(Constants.TAG, "Check if key has no passphrase...");
+            PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
+                    "SC").build("".toCharArray());
+            PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor);
+            if (testKey != null) {
+                Log.d(Constants.TAG, "Key has no passphrase! Caches empty passphrase!");
+
+                // cache empty passphrase
+                PassphraseCacheService.addCachedPassphrase(context, secretKey.getKeyID(), "");
+
+                return false;
+            }
+        } catch (PGPException e) {
+            // silently catch
+        }
+
+        return true;
+    }
+
+    /**
      * Register BroadcastReceiver that is unregistered when service is destroyed. This
      * BroadcastReceiver hears on intents with ACTION_PASSPHRASE_CACHE_SERVICE to then timeout
      * specific passphrases in memory.
@@ -154,11 +259,6 @@ public class PassphraseCacheService extends Service {
         return sender;
     }
 
-    @Override
-    public void onCreate() {
-        Log.d(TAG, "onCreate()");
-    }
-
     /**
      * Executed when service is started by intent
      */
@@ -169,20 +269,41 @@ public class PassphraseCacheService extends Service {
         // register broadcastreceiver
         registerReceiver();
 
-        if (intent != null) {
-            long ttl = intent.getLongExtra(EXTRA_TTL, DEFAULT_TTL);
-            long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1);
-            String passphrase = intent.getStringExtra(EXTRA_PASSPHRASE);
-
-            Log.d(TAG, "Received intent in onStartCommand() with keyId: " + keyId + ", ttl: " + ttl);
-
-            // add keyId and passphrase to memory
-            mPassphraseCache.put(keyId, passphrase);
-
-            // register new alarm with keyId for this passphrase
-            long triggerTime = new Date().getTime() + (ttl * 1000);
-            AlarmManager am = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
-            am.set(AlarmManager.RTC_WAKEUP, triggerTime, buildIntent(this, keyId));
+        if (intent != null && intent.getAction() != null) {
+            if (ACTION_PASSPHRASE_CACHE_ADD.equals(intent.getAction())) {
+                long ttl = intent.getLongExtra(EXTRA_TTL, DEFAULT_TTL);
+                long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1);
+                String passphrase = intent.getStringExtra(EXTRA_PASSPHRASE);
+
+                Log.d(TAG,
+                        "Received ACTION_PASSPHRASE_CACHE_ADD intent in onStartCommand() with keyId: "
+                                + keyId + ", ttl: " + ttl);
+
+                // add keyId and passphrase to memory
+                mPassphraseCache.put(keyId, passphrase);
+
+                // register new alarm with keyId for this passphrase
+                long triggerTime = new Date().getTime() + (ttl * 1000);
+                AlarmManager am = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
+                am.set(AlarmManager.RTC_WAKEUP, triggerTime, buildIntent(this, keyId));
+            } else if (ACTION_PASSPHRASE_CACHE_GET.equals(intent.getAction())) {
+                long keyId = intent.getLongExtra(EXTRA_KEY_ID, -1);
+                Messenger messenger = intent.getParcelableExtra(EXTRA_MESSENGER);
+
+                String passphrase = getCachedPassphraseImpl(keyId);
+
+                Message msg = Message.obtain();
+                Bundle bundle = new Bundle();
+                bundle.putString(EXTRA_PASSPHRASE, passphrase);
+                msg.obj = bundle;
+                try {
+                    messenger.send(msg);
+                } catch (RemoteException e) {
+                    Log.e(Constants.TAG, "Sending message failed", e);
+                }
+            } else {
+                Log.e(Constants.TAG, "Intent or Intent Action not supported!");
+            }
         }
 
         return START_STICKY;
@@ -198,7 +319,7 @@ public class PassphraseCacheService extends Service {
         // remove passphrase corresponding to keyId from memory
         mPassphraseCache.remove(keyId);
 
-        Log.d(TAG, "Timeout of " + keyId + ", removed from memory!");
+        Log.d(TAG, "Timeout of keyId " + keyId + ", removed from memory!");
 
         // stop whole service if no cached passphrases remaining
         if (mPassphraseCache.isEmpty()) {
@@ -208,12 +329,25 @@ public class PassphraseCacheService extends Service {
     }
 
     @Override
+    public void onCreate() {
+        super.onCreate();
+        mContext = this;
+        Log.d(Constants.TAG, "PassphraseCacheService, onCreate()");
+    }
+
+    @Override
     public void onDestroy() {
-        Log.d(TAG, "onDestroy()");
+        super.onDestroy();
+        Log.d(Constants.TAG, "PassphraseCacheService, onDestroy()");
 
         unregisterReceiver(mIntentReceiver);
     }
 
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
     public class PassphraseCacheBinder extends Binder {
         public PassphraseCacheService getService() {
             return PassphraseCacheService.this;
@@ -222,9 +356,4 @@ public class PassphraseCacheService extends Service {
 
     private final IBinder mBinder = new PassphraseCacheBinder();
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index 1e7fe0120..06d59b9a2 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -199,7 +199,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         // Send all information needed to service to sign key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_SIGN_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
+                KeychainIntentService.ACTION_SIGN_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -210,8 +211,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after signing is done in ApgService
-        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, R.string.progress_signing,
-                ProgressDialog.STYLE_SPINNER) {
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
+                R.string.progress_signing, ProgressDialog.STYLE_SPINNER) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
@@ -250,7 +251,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         // Send all information needed to service to upload key in other thread
         Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_UPLOAD_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
+                KeychainIntentService.ACTION_UPLOAD_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -264,8 +266,8 @@ public class SignKeyActivity extends SherlockFragmentActivity {
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after uploading is done in ApgService
-        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, R.string.progress_exporting,
-                ProgressDialog.STYLE_HORIZONTAL) {
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
+                R.string.progress_exporting, ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index 10fc74551..9e42b1f4e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
@@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain.ui.dialog;
 import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPPrivateKey;
 import org.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.sufficientlysecure.keychain.Constants;
@@ -44,7 +43,6 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
 
-
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -80,7 +78,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
             long secretKeyId) throws PgpGeneralException {
         // check if secret key has a passphrase
         if (!(secretKeyId == Id.key.symmetric || secretKeyId == Id.key.none)) {
-            if (!hasPassphrase(context, secretKeyId)) {
+            if (!PassphraseCacheService.hasPassphrase(context, secretKeyId)) {
                 throw new PgpMain.PgpGeneralException("No passphrase! No passphrase dialog needed!");
             }
         }
@@ -95,39 +93,6 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
         return frag;
     }
 
-    /**
-     * Checks if key has a passphrase
-     * 
-     * @param secretKeyId
-     * @return true if it has a passphrase
-     */
-    private static boolean hasPassphrase(Context context, long secretKeyId) {
-        // check if the key has no passphrase
-        try {
-            PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper
-                    .getPGPSecretKeyRingByKeyId(context, secretKeyId));
-            // PGPSecretKey secretKey =
-            // PGPHelper.getMasterKey(PGPMain.getSecretKeyRing(secretKeyId));
-
-            Log.d(Constants.TAG, "Check if key has no passphrase...");
-            PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
-                    "SC").build("".toCharArray());
-            PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor);
-            if (testKey != null) {
-                Log.d(Constants.TAG, "Key has no passphrase! Caches empty passphrase!");
-
-                // cache empty passphrase
-                PassphraseCacheService.addCachedPassphrase(context, secretKey.getKeyID(), "");
-
-                return false;
-            }
-        } catch (PGPException e) {
-            // silently catch
-        }
-
-        return true;
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -153,7 +118,8 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
             alert.setMessage(R.string.passPhraseForSymmetricEncryption);
         } else {
             // TODO: by master key id???
-            secretKey = PgpHelper.getMasterKey(ProviderHelper.getPGPSecretKeyRingByKeyId(activity, secretKeyId));
+            secretKey = PgpHelper.getMasterKey(ProviderHelper.getPGPSecretKeyRingByKeyId(activity,
+                    secretKeyId));
             // secretKey = PGPHelper.getMasterKey(PGPMain.getSecretKeyRing(secretKeyId));
 
             if (secretKey == null) {
@@ -181,7 +147,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
         mPassphraseEditText = (EditText) view.findViewById(R.id.passphrase_passphrase);
 
         alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            
+
             @Override
             public void onClick(DialogInterface dialog, int id) {
                 dismiss();
@@ -189,38 +155,42 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
                 boolean keyOK = true;
                 String passPhrase = mPassphraseEditText.getText().toString();
                 long keyId;
-		PGPSecretKey clickSecretKey = secretKey;
+                PGPSecretKey clickSecretKey = secretKey;
 
                 if (clickSecretKey != null) {
                     while (keyOK == true) {
-                        if (clickSecretKey != null) { //check again for loop
+                        if (clickSecretKey != null) { // check again for loop
                             try {
                                 PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder()
                                         .setProvider(PgpMain.BOUNCY_CASTLE_PROVIDER_NAME).build(
                                                 passPhrase.toCharArray());
-                                PGPPrivateKey testKey = clickSecretKey.extractPrivateKey(keyDecryptor);
+                                PGPPrivateKey testKey = clickSecretKey
+                                        .extractPrivateKey(keyDecryptor);
                                 if (testKey == null) {
                                     if (!clickSecretKey.isMasterKey()) {
-                                        Toast.makeText(activity, R.string.error_couldNotExtractPrivateKey,
+                                        Toast.makeText(activity,
+                                                R.string.error_couldNotExtractPrivateKey,
                                                 Toast.LENGTH_SHORT).show();
                                         return;
                                     } else {
-                                        clickSecretKey = PgpHelper.getKeyNum(ProviderHelper.getPGPSecretKeyRingByKeyId(activity, secretKeyId), curKeyIndex);
-                                        curKeyIndex++; //does post-increment work like C?
+                                        clickSecretKey = PgpHelper.getKeyNum(ProviderHelper
+                                                .getPGPSecretKeyRingByKeyId(activity, secretKeyId),
+                                                curKeyIndex);
+                                        curKeyIndex++; // does post-increment work like C?
                                         continue;
                                     }
                                 } else {
                                     keyOK = false;
                                 }
                             } catch (PGPException e) {
-                                Toast.makeText(activity, R.string.wrongPassPhrase, Toast.LENGTH_SHORT)
-                                        .show();
+                                Toast.makeText(activity, R.string.wrongPassPhrase,
+                                        Toast.LENGTH_SHORT).show();
                                 return;
                             }
                         } else {
                             Toast.makeText(activity, R.string.error_couldNotExtractPrivateKey,
                                     Toast.LENGTH_SHORT).show();
-                            return; //ran out of keys to try
+                            return; // ran out of keys to try
                         }
                     }
                     keyId = secretKey.getKeyID();
@@ -232,7 +202,8 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
                 Log.d(Constants.TAG, "Everything okay! Caching entered passphrase");
                 PassphraseCacheService.addCachedPassphrase(activity, keyId, passPhrase);
                 if (keyOK == false && clickSecretKey.getKeyID() != keyId) {
-                    PassphraseCacheService.addCachedPassphrase(activity, clickSecretKey.getKeyID(), passPhrase);
+                    PassphraseCacheService.addCachedPassphrase(activity, clickSecretKey.getKeyID(),
+                            passPhrase);
                 }
 
                 sendMessageToHandler(MESSAGE_OKAY);
@@ -240,7 +211,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
         });
 
         alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-            
+
             @Override
             public void onClick(DialogInterface dialog, int id) {
                 dismiss();
@@ -255,7 +226,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
     public void onActivityCreated(Bundle arg0) {
         super.onActivityCreated(arg0);
         if (canKB) {
-        // request focus and open soft keyboard
+            // request focus and open soft keyboard
             mPassphraseEditText.requestFocus();
             getDialog().getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
 
@@ -298,4 +269,3 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
     }
 
 }
-
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 898b05372..6d94889cf 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -103,11 +103,11 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
     }
 
     public void setCanEdit(boolean bCanEdit) {
-         canEdit = bCanEdit;
-         mPlusButton = (ImageView)findViewById(R.id.plusbutton);
-         if (!canEdit) {
-             mPlusButton.setVisibility(View.INVISIBLE);
-         }
+        canEdit = bCanEdit;
+        mPlusButton = (ImageView) findViewById(R.id.plusbutton);
+        if (!canEdit) {
+            mPlusButton.setVisibility(View.INVISIBLE);
+        }
     }
 
     /** {@inheritDoc} */
@@ -141,82 +141,85 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
     /** {@inheritDoc} */
     public void onClick(View v) {
         if (canEdit) {
-        switch (mType) {
-        case Id.type.user_id: {
-            UserIdEditor view = (UserIdEditor) mInflater.inflate(R.layout.edit_key_user_id_item,
-                    mEditors, false);
-            view.setEditorListener(this);
-            if (mEditors.getChildCount() == 0) {
-                view.setIsMainUserId(true);
+            switch (mType) {
+            case Id.type.user_id: {
+                UserIdEditor view = (UserIdEditor) mInflater.inflate(
+                        R.layout.edit_key_user_id_item, mEditors, false);
+                view.setEditorListener(this);
+                if (mEditors.getChildCount() == 0) {
+                    view.setIsMainUserId(true);
+                }
+                mEditors.addView(view);
+                break;
             }
-            mEditors.addView(view);
-            break;
-        }
 
-        case Id.type.key: {
-            AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
-
-            View view = mInflater.inflate(R.layout.create_key, null);
-            dialog.setView(view);
-            dialog.setTitle(R.string.title_createKey);
+            case Id.type.key: {
+                AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
 
-            boolean wouldBeMasterKey = (mEditors.getChildCount() == 0);
+                View view = mInflater.inflate(R.layout.create_key, null);
+                dialog.setView(view);
+                dialog.setTitle(R.string.title_createKey);
 
-            final Spinner algorithm = (Spinner) view.findViewById(R.id.create_key_algorithm);
-            Vector<Choice> choices = new Vector<Choice>();
-            choices.add(new Choice(Id.choice.algorithm.dsa, getResources().getString(R.string.dsa)));
-            if (!wouldBeMasterKey) {
-                choices.add(new Choice(Id.choice.algorithm.elgamal, getResources().getString(
-                        R.string.elgamal)));
-            }
+                boolean wouldBeMasterKey = (mEditors.getChildCount() == 0);
 
-            choices.add(new Choice(Id.choice.algorithm.rsa, getResources().getString(R.string.rsa)));
-
-            ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(getContext(),
-                    android.R.layout.simple_spinner_item, choices);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            algorithm.setAdapter(adapter);
-            // make RSA the default
-            for (int i = 0; i < choices.size(); ++i) {
-                if (choices.get(i).getId() == Id.choice.algorithm.rsa) {
-                    algorithm.setSelection(i);
-                    break;
+                final Spinner algorithm = (Spinner) view.findViewById(R.id.create_key_algorithm);
+                Vector<Choice> choices = new Vector<Choice>();
+                choices.add(new Choice(Id.choice.algorithm.dsa, getResources().getString(
+                        R.string.dsa)));
+                if (!wouldBeMasterKey) {
+                    choices.add(new Choice(Id.choice.algorithm.elgamal, getResources().getString(
+                            R.string.elgamal)));
                 }
-            }
-
-            final EditText keySize = (EditText) view.findViewById(R.id.create_key_size);
 
-            dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface di, int id) {
-                    di.dismiss();
-                    try {
-                        mNewKeySize = Integer.parseInt("" + keySize.getText());
-                    } catch (NumberFormatException e) {
-                        mNewKeySize = 0;
+                choices.add(new Choice(Id.choice.algorithm.rsa, getResources().getString(
+                        R.string.rsa)));
+
+                ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(getContext(),
+                        android.R.layout.simple_spinner_item, choices);
+                adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+                algorithm.setAdapter(adapter);
+                // make RSA the default
+                for (int i = 0; i < choices.size(); ++i) {
+                    if (choices.get(i).getId() == Id.choice.algorithm.rsa) {
+                        algorithm.setSelection(i);
+                        break;
                     }
-
-                    mNewKeyAlgorithmChoice = (Choice) algorithm.getSelectedItem();
-                    createKey();
                 }
-            });
-
-            dialog.setCancelable(true);
-            dialog.setNegativeButton(android.R.string.cancel,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface di, int id) {
-                            di.dismiss();
-                        }
-                    });
 
-            dialog.create().show();
-            break;
-        }
+                final EditText keySize = (EditText) view.findViewById(R.id.create_key_size);
+
+                dialog.setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface di, int id) {
+                                di.dismiss();
+                                try {
+                                    mNewKeySize = Integer.parseInt("" + keySize.getText());
+                                } catch (NumberFormatException e) {
+                                    mNewKeySize = 0;
+                                }
+
+                                mNewKeyAlgorithmChoice = (Choice) algorithm.getSelectedItem();
+                                createKey();
+                            }
+                        });
+
+                dialog.setCancelable(true);
+                dialog.setNegativeButton(android.R.string.cancel,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface di, int id) {
+                                di.dismiss();
+                            }
+                        });
+
+                dialog.create().show();
+                break;
+            }
 
-        default: {
-            break;
-        }
-        }
-        this.updateEditorsVisible();
+            default: {
+                break;
+            }
+            }
+            this.updateEditorsVisible();
         }
     }
 
@@ -266,7 +269,8 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         // Send all information needed to service to edit key in other thread
         Intent intent = new Intent(mActivity, KeychainIntentService.class);
 
-        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_GENERATE_KEY);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION,
+                KeychainIntentService.ACTION_GENERATE_KEY);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -293,7 +297,8 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                 ProgressDialog.STYLE_SPINNER);
 
         // Message is received after generating is done in ApgService
-        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(mActivity, mGeneratingDialog) {
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(mActivity,
+                mGeneratingDialog) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
@@ -302,7 +307,8 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                     // get new key from data bundle returned from service
                     Bundle data = message.getData();
                     PGPSecretKeyRing newKeyRing = (PGPSecretKeyRing) PgpConversionHelper
-                            .BytesToPGPKeyRing(data.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
+                            .BytesToPGPKeyRing(data
+                                    .getByteArray(KeychainIntentService.RESULT_NEW_KEY));
 
                     boolean isMasterKey = (mEditors.getChildCount() == 0);
 
diff --git a/README.md b/README.md
index 50de7a650..519b533c2 100644
--- a/README.md
+++ b/README.md
@@ -8,22 +8,29 @@ Fork OpenPGP Keychain and do a merge request. I will merge your changes back int
 
 # Build
 
+## Build with Gradle
+
+1. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html)
+2. Export ANDROID_HOME pointing to your Android SDK
+3. Install gradle
+4. Execute ``gradle wrapper`` (http://www.gradle.org/docs/current/userguide/gradle_wrapper.html)
+5. Execute ``./gradlew assemble``
+
 ## Build with Ant
 
 1. Have Android SDK "tools" directory in your PATH (http://developer.android.com/sdk/index.html)
-2. Change to "OpenPGP-Kechain" directory with ``cd OpenPGP-Kechain``
-3. Execute ``android update project -p .`` and  ``android update project -p android-libs/ActionBarSherlock``
-4. Execute ``ant debug``
+2. Execute ``android update project -p OpenPGP-Keychain`` and  ``android update project -p libraries/ActionBarSherlock``
+3. Execute ``cd OpenPGP-Kechain``, ``ant debug``
 
 ## Build with Eclipse
 
-1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain/android-libs/ActionBarSherlock"
+1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "libraries/ActionBarSherlock"
 2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain"
 3. OpenPGP-Kechain can now be build
 
 # Libraries
 
-All JAR-Libraries are provided in this repository under "libs", all Android Library projects are under "android-libs".
+All JAR-Libraries are provided in this repository under "libs", all Android Library projects are under "libraries".
 
 * ActionBarSherlock to provide an ActionBar for Android < 3.0
 * forked Spongy Castle Crypto Lib (Android version of Bouncy Castle)
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..a4573e05d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,4 @@
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.6'
+}
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore b/libraries/ActionBarSherlock/.gitignore
index 2e423e1a3..71c11b159 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore
+++ b/libraries/ActionBarSherlock/.gitignore
@@ -1,23 +1,30 @@
-#Android generated
+#Android specific
 bin
 gen
 obj
 libs/armeabi
 lint.xml
 local.properties
+release.properties
+ant.properties
+*.class
+*.apk
+
+#Gradle
+.gradle
+build
+gradle.properties
+
+#Maven
+target
+pom.xml.*
 
 #Eclipse
 .project
 .classpath
 .settings
+.metadata
 
 #IntelliJ IDEA
 .idea
 *.iml
-
-#Maven
-target
-release.properties
-
-#Mac
-.DS_Store
\ No newline at end of file
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml b/libraries/ActionBarSherlock/AndroidManifest.xml
index 7b8a84824..7b8a84824 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml
+++ b/libraries/ActionBarSherlock/AndroidManifest.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md b/libraries/ActionBarSherlock/README.md
index e8a2c080e..e8a2c080e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md
+++ b/libraries/ActionBarSherlock/README.md
diff --git a/libraries/ActionBarSherlock/build.gradle b/libraries/ActionBarSherlock/build.gradle
new file mode 100644
index 000000000..102d66946
--- /dev/null
+++ b/libraries/ActionBarSherlock/build.gradle
@@ -0,0 +1,27 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4.1'
+    }
+}
+
+apply plugin: 'android-library'
+
+dependencies {
+    compile files('libs/android-support-v4.jar')
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion '17'
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+        }
+    }
+}
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml b/libraries/ActionBarSherlock/build.xml
index a10a91491..a10a91491 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml
+++ b/libraries/ActionBarSherlock/build.xml
diff --git a/libraries/ActionBarSherlock/libs/android-support-v4.jar b/libraries/ActionBarSherlock/libs/android-support-v4.jar
new file mode 100644
index 000000000..99e063b33
--- /dev/null
+++ b/libraries/ActionBarSherlock/libs/android-support-v4.jar
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml b/libraries/ActionBarSherlock/pom.xml
index 3b6ce40ce..3b6ce40ce 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml
+++ b/libraries/ActionBarSherlock/pom.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt b/libraries/ActionBarSherlock/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt
+++ b/libraries/ActionBarSherlock/proguard-project.txt
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties b/libraries/ActionBarSherlock/project.properties
index 5ca7d6247..5ca7d6247 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties
+++ b/libraries/ActionBarSherlock/project.properties
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
index ea7459aaf..ea7459aaf 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
index 0edb33b4b..0edb33b4b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
index 2bcfd0b63..2bcfd0b63 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
index 198384fed..198384fed 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
index 769463b36..769463b36 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 88f11dcb9..88f11dcb9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
index 73050476e..73050476e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 712a551ec..712a551ec 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
index bf3b9438b..bf3b9438b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
index 81b87b86c..81b87b86c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
index 8fc83e22e..8fc83e22e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
index cbbaec588..cbbaec588 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
index af917e5b6..af917e5b6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
index 2d59f354e..2d59f354e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
index 0520e5a2f..0520e5a2f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
index e3e3f93b9..e3e3f93b9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 1e3957222..1e3957222 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
index a16db853e..a16db853e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
index 0eff695d8..0eff695d8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
index 219b170fa..219b170fa 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
index b0dc31fb3..b0dc31fb3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
index 4bc2683b1..4bc2683b1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 4af38fb70..4af38fb70 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
index d32f74cf4..d32f74cf4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 66adffed6..66adffed6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
index caeff9c33..caeff9c33 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
index 1d836f65a..1d836f65a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
index 5818666d4..5818666d4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
index 564fb34b4..564fb34b4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
index ae21b760f..ae21b760f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
index 79e56f522..79e56f522 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
index e029f210b..e029f210b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
index 897a1c11a..897a1c11a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
index 0c89f7140..0c89f7140 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
index d8662e3f0..d8662e3f0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
index ed03f620f..ed03f620f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
index d97c342d5..d97c342d5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
index 33ad8d4b8..33ad8d4b8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
index 3edbd7408..3edbd7408 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
index 90db01b5b..90db01b5b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
index 97b825e83..97b825e83 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
index 7e1ba2adc..7e1ba2adc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index 2abc45809..2abc45809 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index bb6aef1d0..bb6aef1d0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
index 6f747c8f0..6f747c8f0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
index 682b2fdec..682b2fdec 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
index 4be72f108..4be72f108 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
index 72e207bc5..72e207bc5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
index 66d14aec0..66d14aec0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
index 3481c9828..3481c9828 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
index 4ea7afa00..4ea7afa00 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
index 986ab0b97..986ab0b97 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
index 0279e17a1..0279e17a1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
index 516f5c739..516f5c739 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
index 4ea7afa00..4ea7afa00 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
index 5654cd694..5654cd694 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
index 5654cd694..5654cd694 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
index f6fd30dcd..f6fd30dcd 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
index ca8e9a277..ca8e9a277 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 4d3d20857..4d3d20857 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
index 924a99d17..924a99d17 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
index 310c368e7..310c368e7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
index 70cb7fc7e..70cb7fc7e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
index 1c269205e..1c269205e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
index 1c269205e..1c269205e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
index 40d0d1645..40d0d1645 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
index 40d0d1645..40d0d1645 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
index c8358e9ce..c8358e9ce 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
index f62f74bb3..f62f74bb3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
index eb28ff9a5..eb28ff9a5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
index d281adb55..d281adb55 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
index b29858609..b29858609 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
index 4215396dd..4215396dd 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
index a280eabf5..a280eabf5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
index f8d619b4d..f8d619b4d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 955a2f340..955a2f340 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6c22e223a..6c22e223a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
index 673e3bf10..673e3bf10 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
index d57df98b5..d57df98b5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
index 6278eef47..6278eef47 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
index aadc6f87b..aadc6f87b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
index 70c0e7396..70c0e7396 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
index 36e71d85d..36e71d85d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
index 4be4af5fa..4be4af5fa 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
index e72193f59..e72193f59 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 8f20b9d26..8f20b9d26 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
index 04f657e1d..04f657e1d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
index 99309ef6d..99309ef6d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
index 9bde7fbdc..9bde7fbdc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
index b2293670b..b2293670b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
index c65f443e3..c65f443e3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
index 0706c8af6..0706c8af6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
index d814d02d3..d814d02d3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
index b139c8e49..b139c8e49 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
index 738cb38d0..738cb38d0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
index 2ed75a767..2ed75a767 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
index 743d00b6c..743d00b6c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
index 17c1fb921..17c1fb921 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
index ddfc8e3d5..ddfc8e3d5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
index 007a4b239..007a4b239 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
index ad6e1a4d9..ad6e1a4d9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 0ad6c888b..0ad6c888b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
index 19b50abcb..19b50abcb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
index ad980b13f..ad980b13f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
index 60e6c5278..60e6c5278 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
index 5461b9c00..5461b9c00 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
index 5dc6f804a..5dc6f804a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
index a70b53c59..a70b53c59 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
index c7a9896b0..c7a9896b0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 85d7aadd4..85d7aadd4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
index f7b01e012..f7b01e012 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
index d8f1c8bd5..d8f1c8bd5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
index 31e49894a..31e49894a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
index 7c2cbe535..7c2cbe535 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
index 30cbdc174..30cbdc174 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
index fb3660eab..fb3660eab 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
index f18050ea5..f18050ea5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
index df2d3d158..df2d3d158 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
index b2aa9c265..b2aa9c265 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
index a17b6a789..a17b6a789 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
index b28b3b54f..b28b3b54f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
index 79228baed..79228baed 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
index 86944a879..86944a879 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
index c0bdf0641..c0bdf0641 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
index 15b86cbb2..15b86cbb2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
index bf19833f2..bf19833f2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
index 8518498eb..8518498eb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index ba704b67e..ba704b67e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 01d681697..01d681697 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
index 6bf21e307..6bf21e307 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
index 70fe31aa2..70fe31aa2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
index 4be72f108..4be72f108 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
index f2e26f883..f2e26f883 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
index 73c6be654..73c6be654 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
index 71d838e73..71d838e73 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
index 3bf8e0362..3bf8e0362 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
index 986ab0b97..986ab0b97 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
index 0279e17a1..0279e17a1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
index 7c0599e3a..7c0599e3a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
index 3bf8e0362..3bf8e0362 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
index 6e77525d2..6e77525d2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
index 6e77525d2..6e77525d2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
index 92da2f0dd..92da2f0dd 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
index 42cb6463e..42cb6463e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 460ec46eb..460ec46eb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
index e84adf2d4..e84adf2d4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
index 3d946e545..3d946e545 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
index 4bb22f0e1..4bb22f0e1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
index ab8ec6984..ab8ec6984 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
index ab8ec6984..ab8ec6984 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
index 7274274b1..7274274b1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
index 7274274b1..7274274b1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
index 9458668f0..9458668f0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
index 4ce73edce..4ce73edce 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
index 29aff4d43..29aff4d43 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
index 4055f7053..4055f7053 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
index ea4ee042e..ea4ee042e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
index f74c02b9e..f74c02b9e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
index 09a2992cc..09a2992cc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
index 6536ee633..6536ee633 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 202b5b72e..202b5b72e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6de0ba884..6de0ba884 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
index c9972e74b..c9972e74b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
index 587337caf..587337caf 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
index 155c4fc75..155c4fc75 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
index b1223fe3c..b1223fe3c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
index 081657ee7..081657ee7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
index 3f312b465..3f312b465 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
index b086fae87..b086fae87 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
index 73c336a77..73c336a77 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 726e0ff42..726e0ff42 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
index 726e0ff42..726e0ff42 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
index 1767c169e..1767c169e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
index 1767c169e..1767c169e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml b/libraries/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
index 6bcbdb83f..6bcbdb83f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
+++ b/libraries/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
index 575334699..575334699 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 7e6c047d6..7e6c047d6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
index 8155fe840..8155fe840 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 6cee9a128..6cee9a128 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
index fa4d76af9..fa4d76af9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
index 9a70a5d1e..9a70a5d1e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
index 14fbee101..14fbee101 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
index 6622cbad3..6622cbad3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
index c42729783..c42729783 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
index d0df29d8b..d0df29d8b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
index a0d9c1b95..a0d9c1b95 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
index d36f99fec..d36f99fec 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 5ad475dc3..5ad475dc3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
index 6ade5eeb3..6ade5eeb3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
index 719b9234d..719b9234d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
index 6da264db2..6da264db2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
index 7ef2db75e..7ef2db75e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
index 2283b4c01..2283b4c01 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 6d2039e28..6d2039e28 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
index 3c909b513..3c909b513 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 131d1030c..131d1030c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
index 3e7dcdfdb..3e7dcdfdb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
index 0bd09806f..0bd09806f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
index 43ed26d47..43ed26d47 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
index 6b3157985..6b3157985 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
index df0121bb3..df0121bb3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
index f4970ad1c..f4970ad1c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
index 172fc3b5e..172fc3b5e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
index 8ded62fb7..8ded62fb7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
index 517e9f72d..517e9f72d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
index 2e06dd01b..2e06dd01b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
index bb19810bc..bb19810bc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
index e35c5f05e..e35c5f05e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
index 7fd7aeb2a..7fd7aeb2a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
index 53cfbd311..53cfbd311 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
index 1e2dcfa02..1e2dcfa02 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
index f12eafcdc..f12eafcdc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index a92fb1d4a..a92fb1d4a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 930ca8d95..930ca8d95 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
index 45a0f1da0..45a0f1da0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
index 528e554ab..528e554ab 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
index 998f91be9..998f91be9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
index a4cdf1c79..a4cdf1c79 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
index c625a3602..c625a3602 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
index c332ba08c..c332ba08c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
index eda10e612..eda10e612 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
index e62f011d4..e62f011d4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
index 65061c0f4..65061c0f4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
index 690cb1eb6..690cb1eb6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
index eda10e612..eda10e612 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
index e4b33935a..e4b33935a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
index e4b33935a..e4b33935a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
index 88726b691..88726b691 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
index c6a7d4d87..c6a7d4d87 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
index e2aff72f4..e2aff72f4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
index 93066c840..93066c840 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
index 345f5d306..345f5d306 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
index c843ef3af..c843ef3af 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
index c6c3f1ec2..c6c3f1ec2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
index c6c3f1ec2..c6c3f1ec2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
index 205b66e2c..205b66e2c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
index 205b66e2c..205b66e2c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
index 19517c4b0..19517c4b0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
index 14143c51c..14143c51c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
index d8929fcd1..d8929fcd1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
index 9174c4e4b..9174c4e4b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
index 3015d3070..3015d3070 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
index 126637d11..126637d11 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
index d45c7a864..d45c7a864 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
index 29036b907..29036b907 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 2cb34d7f6..2cb34d7f6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
index 82f752fdc..82f752fdc 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
index 03cfb0945..03cfb0945 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
index e4229f26b..e4229f26b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
index e862cb121..e862cb121 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
index f1eb67323..f1eb67323 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
index 8fdbbf3ad..8fdbbf3ad 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
index 4e9ae43c2..4e9ae43c2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
index 98f4871bb..98f4871bb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
index 733373ed3..733373ed3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 0c6bb036d..0c6bb036d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
index 0c6bb036d..0c6bb036d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
index e5bfd8ad3..e5bfd8ad3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
index 1743da6b4..1743da6b4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/libraries/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
index 85c2c0212..85c2c0212 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
index 85c2c0212..85c2c0212 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
index cab896283..cab896283 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
index 42ba8a0df..42ba8a0df 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear.xml
index a16f4b22e..a16f4b22e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
index 256de80fb..256de80fb 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
index 2588a492d..2588a492d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
index e2078c967..e2078c967 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
index d99b7a426..d99b7a426 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
index da5fb2e86..da5fb2e86 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
index b2ce4f0f7..b2ce4f0f7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
index d7e31b1d1..d7e31b1d1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
index 08b8b12f3..08b8b12f3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
index ada490bf9..ada490bf9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
index bd19140ab..bd19140ab 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
index 321f07c8b..321f07c8b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml b/libraries/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
index 6d4814f86..6d4814f86 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
index 26284187a..26284187a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
index 0d00c5878..0d00c5878 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
index 4af5e22a9..4af5e22a9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
index b78508478..b78508478 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml b/libraries/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
index d34e20811..d34e20811 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
index b6d58c040..b6d58c040 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
index 3d6acf808..3d6acf808 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
index 05ff4eda5..05ff4eda5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
index f6d61e57a..f6d61e57a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
+++ b/libraries/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml b/libraries/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
index 8811dad8d..8811dad8d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
+++ b/libraries/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
index 6c183c059..6c183c059 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
+++ b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
index 61dc02527..61dc02527 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
+++ b/libraries/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
index 040df44ab..040df44ab 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
+++ b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
index c64ef141b..c64ef141b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
+++ b/libraries/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_home.xml
index 5c1e9ec4b..5c1e9ec4b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_bar_home.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
index f46f7a044..f46f7a044 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
index 0d51220c9..0d51220c9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml b/libraries/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
index dd69acada..dd69acada 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
index 13149fd63..13149fd63 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
index a6f8e53f8..a6f8e53f8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml b/libraries/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
index 7168dc77f..7168dc77f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml b/libraries/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
index 875ec3e1b..875ec3e1b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
index 6a0ac9ece..6a0ac9ece 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
index b430032a1..b430032a1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
index ab2b0ee6c..ab2b0ee6c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
index 39aca3a8d..39aca3a8d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
index 55ab28a24..55ab28a24 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
index 147f36fe8..147f36fe8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
index ff54bbecd..ff54bbecd 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml b/libraries/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
index d42425ad3..d42425ad3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
index 1fb82fe9a..1fb82fe9a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
index 0961ef561..0961ef561 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_simple.xml
index 33e2dea0d..33e2dea0d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__screen_simple.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml b/libraries/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
index f8b9fb185..f8b9fb185 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/libraries/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
index e1d3dc49c..e1d3dc49c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml b/libraries/ActionBarSherlock/res/layout/abs__search_view.xml
index 6ba319121..6ba319121 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__search_view.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
index 8fc0eb12c..8fc0eb12c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
+++ b/libraries/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
index a6c6252d2..a6c6252d2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
+++ b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
index bea740178..bea740178 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
+++ b/libraries/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-land/abs__dimens.xml
index 502cc16a3..502cc16a3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-land/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
index 3312cfa7f..3312cfa7f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
index 502cc16a3..502cc16a3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
index 3312cfa7f..3312cfa7f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
index 35910333b..35910333b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml
index 63b12f7f3..63b12f7f3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-large/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml b/libraries/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
index 7a48e1542..7a48e1542 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
+++ b/libraries/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
index f67853817..f67853817 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml b/libraries/ActionBarSherlock/res/values-v11/abs__themes.xml
index 03473572c..03473572c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml
+++ b/libraries/ActionBarSherlock/res/values-v11/abs__themes.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml b/libraries/ActionBarSherlock/res/values-v14/abs__styles.xml
index 88a60dd92..88a60dd92 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml
+++ b/libraries/ActionBarSherlock/res/values-v14/abs__styles.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml b/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml
index 5fac1ab58..5fac1ab58 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml
+++ b/libraries/ActionBarSherlock/res/values-v14/abs__themes.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
index 6f49d7e47..6f49d7e47 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml b/libraries/ActionBarSherlock/res/values-w480dp/abs__bools.xml
index 3eaf4aee9..3eaf4aee9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml
+++ b/libraries/ActionBarSherlock/res/values-w480dp/abs__bools.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml b/libraries/ActionBarSherlock/res/values-w480dp/abs__config.xml
index 88357b0a7..88357b0a7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml
+++ b/libraries/ActionBarSherlock/res/values-w480dp/abs__config.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
index 2fd4deea2..2fd4deea2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
index b085952d3..b085952d3 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml b/libraries/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
index bfc535de1..bfc535de1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml b/libraries/ActionBarSherlock/res/values/abs__attrs.xml
index 32631ca8d..32631ca8d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__attrs.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml b/libraries/ActionBarSherlock/res/values/abs__bools.xml
index 0b432448d..0b432448d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__bools.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml b/libraries/ActionBarSherlock/res/values/abs__colors.xml
index 625c632ff..625c632ff 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__colors.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml b/libraries/ActionBarSherlock/res/values/abs__config.xml
index 4c7b5d459..4c7b5d459 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__config.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml b/libraries/ActionBarSherlock/res/values/abs__dimens.xml
index 831289e07..831289e07 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__dimens.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml b/libraries/ActionBarSherlock/res/values/abs__ids.xml
index f9f56045b..f9f56045b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__ids.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml b/libraries/ActionBarSherlock/res/values/abs__strings.xml
index 06a2a2af4..06a2a2af4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__strings.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml b/libraries/ActionBarSherlock/res/values/abs__styles.xml
index 45a18c183..45a18c183 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__styles.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml b/libraries/ActionBarSherlock/res/values/abs__themes.xml
index 634fa798b..634fa798b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml
+++ b/libraries/ActionBarSherlock/res/values/abs__themes.xml
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java b/libraries/ActionBarSherlock/src/android/support/v4/app/Watson.java
index d93de4c6a..d93de4c6a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java
+++ b/libraries/ActionBarSherlock/src/android/support/v4/app/Watson.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
index ab160f836..ab160f836 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
index 03755be2b..03755be2b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
index 7b4543640..7b4543640 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
index a7c856bf0..a7c856bf0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
index 078f9b0ca..078f9b0ca 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
index 0f24e9c85..0f24e9c85 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
index 3d092f033..3d092f033 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
index aba6d85e8..aba6d85e8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
index 13ca3c49f..13ca3c49f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
index bee72cb25..bee72cb25 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
index 5e69275c7..5e69275c7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
index 0824d3848..0824d3848 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
index 8e1efe8c5..8e1efe8c5 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
index d022a2465..d022a2465 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
index 840cb3d27..840cb3d27 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
index 2caf5b4a9..2caf5b4a9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
index 02ddff48d..02ddff48d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
index 3231080c4..3231080c4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
index e41019364..e41019364 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
index 6d9dafa7a..6d9dafa7a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
index ed5e79ec6..ed5e79ec6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
index e9215e7f8..e9215e7f8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
index ab76fa7f6..ab76fa7f6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
index a71e1ad3c..a71e1ad3c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
index 21d15c02a..21d15c02a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
index 84f7504ab..84f7504ab 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
index 0ea319244..0ea319244 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
index d8a12c688..d8a12c688 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
index 7b830b9c0..7b830b9c0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
index 067d0494e..067d0494e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
index 953e3e844..953e3e844 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
index 129b5aaaa..129b5aaaa 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
index 1f381013a..1f381013a 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
index b136d50f0..b136d50f0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
index 0a87bd3f7..0a87bd3f7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
index 7d45e81be..7d45e81be 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
index 3869d3290..3869d3290 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
index 0354ad1ad..0354ad1ad 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
index 510b97488..510b97488 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
index dcb50f362..dcb50f362 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
index 876a22c58..876a22c58 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
index 0e3b1ae0d..0e3b1ae0d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
index 6da26f2ae..6da26f2ae 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
index ac25c3736..ac25c3736 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
index 179b8f037..179b8f037 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
index f5359fb40..f5359fb40 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
index aaf2997b7..aaf2997b7 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
index f030de310..f030de310 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
index c3f35472c..c3f35472c 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
index 323ba2d88..323ba2d88 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
index 3d4dd42fd..3d4dd42fd 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
index 6679cf386..6679cf386 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
index 7d307acb1..7d307acb1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
index 3a4a44675..3a4a44675 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
index 1d9c68b37..1d9c68b37 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
index 9ec250f38..9ec250f38 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
index 4636de17f..4636de17f 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
index fa3698f3b..fa3698f3b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
index cae8b8aed..cae8b8aed 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
index 14f092c81..14f092c81 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
index ad1b4f0a8..ad1b4f0a8 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
index ce0cb3bca..ce0cb3bca 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
index c786dc5c1..c786dc5c1 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
index a78b3f71b..a78b3f71b 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
index 4947c41df..4947c41df 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
index d13c6cea9..d13c6cea9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
index 1c02d4aca..1c02d4aca 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
index 038d1e031..038d1e031 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
index a7185d082..a7185d082 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
index 48fb5d8b4..48fb5d8b4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
index 81b4cd4d2..81b4cd4d2 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
index ae7cb1fe0..ae7cb1fe0 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
index 43281b013..43281b013 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
index 951f4ccef..951f4ccef 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
index 5a0f40859..5a0f40859 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
index 7fc3aa430..7fc3aa430 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
index 397fd1c2d..397fd1c2d 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
index a340a4291..a340a4291 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
index d7f110fc6..d7f110fc6 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
index e19ea9e9e..e19ea9e9e 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
index c9e7897d4..c9e7897d4 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
index 83e9f0ca9..83e9f0ca9 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
index bd5cbd718..bd5cbd718 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
diff --git a/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
index 47475c574..47475c574 100644
--- a/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
+++ b/libraries/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..9df383b2a
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':OpenPGP-Keychain', ':libraries:ActionBarSherlock'