diff --git a/app/app.iml b/app/app.iml
index 0c8026a96..ddcb0a8d3 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -63,8 +63,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="JavaEWAH-0.7.9" level="project" />
     <orderEntry type="library" exported="" name="jsch-0.1.50" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
     <orderEntry type="library" exported="" name="org.eclipse.jgit-3.4.1.201406201815-r" level="project" />
+    <orderEntry type="module" module-name="openpgp-api-lib" exported="" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
index 0c82ca2fb..8e039e215 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,6 +21,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':libraries:openpgp-api-lib')
     compile 'org.eclipse.jgit:org.eclipse.jgit:3.4.+'
     compile 'org.apache.commons:commons-io:1.3.2'
+    // You must install or update the Support Repository through the SDK manager to use this dependency.
+    compile 'com.android.support:support-v4:19.+'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16210fdcc..edec0fa14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,12 @@
             android:name=".GitClone"
             android:label="@string/title_activity_git_clone" >
         </activity>
+        <activity android:name=".OpenPgpProviderActivity" />
+        <activity android:name=".UserPreference" />
+        <activity
+            android:name=".PgpHandler"
+            android:label="@string/title_activity_pgp_handler" >
+        </activity>
     </application>
 
     <!--
diff --git a/app/src/main/java/com/zeapo/pwdstore/OpenPgpProviderActivity.java b/app/src/main/java/com/zeapo/pwdstore/OpenPgpProviderActivity.java
new file mode 100644
index 000000000..3d0e09c30
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/OpenPgpProviderActivity.java
@@ -0,0 +1,382 @@
+/*
+ * Copyright (C) 2013-2014 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.zeapo.pwdstore;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import org.openintents.openpgp.OpenPgpError;
+import org.openintents.openpgp.OpenPgpSignatureResult;
+import org.openintents.openpgp.util.OpenPgpApi;
+import org.openintents.openpgp.util.OpenPgpServiceConnection;
+import org.openintents.openpgp.util.OpenPgpUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
+public class OpenPgpProviderActivity extends Activity {
+    private EditText mMessage;
+    private EditText mCiphertext;
+    private EditText mEncryptUserIds;
+    private Button mSign;
+    private Button mEncrypt;
+    private Button mSignAndEncrypt;
+    private Button mDecryptAndVerify;
+    private EditText mAccount;
+    private EditText mGetKeyEdit;
+    private EditText mGetKeyIdsEdit;
+    private Button mGetKey;
+    private Button mGetKeyIds;
+
+    private OpenPgpServiceConnection mServiceConnection;
+
+    public static final int REQUEST_CODE_SIGN = 9910;
+    public static final int REQUEST_CODE_ENCRYPT = 9911;
+    public static final int REQUEST_CODE_SIGN_AND_ENCRYPT = 9912;
+    public static final int REQUEST_CODE_DECRYPT_AND_VERIFY = 9913;
+    public static final int REQUEST_CODE_GET_KEY = 9914;
+    public static final int REQUEST_CODE_GET_KEY_IDS = 9915;
+
+    public final class Constants {
+        public static final String TAG = "Keychain";
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.openpgp_provider);
+
+        mMessage = (EditText) findViewById(R.id.crypto_provider_demo_message);
+        mCiphertext = (EditText) findViewById(R.id.crypto_provider_demo_ciphertext);
+        mEncryptUserIds = (EditText) findViewById(R.id.crypto_provider_demo_encrypt_user_id);
+        mSign = (Button) findViewById(R.id.crypto_provider_demo_sign);
+        mEncrypt = (Button) findViewById(R.id.crypto_provider_demo_encrypt);
+        mSignAndEncrypt = (Button) findViewById(R.id.crypto_provider_demo_sign_and_encrypt);
+        mDecryptAndVerify = (Button) findViewById(R.id.crypto_provider_demo_decrypt_and_verify);
+        mAccount = (EditText) findViewById(R.id.crypto_provider_demo_account);
+        mGetKeyEdit = (EditText) findViewById(R.id.crypto_provider_demo_get_key_edit);
+        mGetKeyIdsEdit = (EditText) findViewById(R.id.crypto_provider_demo_get_key_ids_edit);
+        mGetKey = (Button) findViewById(R.id.crypto_provider_demo_get_key);
+        mGetKeyIds = (Button) findViewById(R.id.crypto_provider_demo_get_key_ids);
+
+        mSign.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                sign(new Intent());
+            }
+        });
+        mEncrypt.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                encrypt(new Intent());
+            }
+        });
+        mSignAndEncrypt.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                signAndEncrypt(new Intent());
+            }
+        });
+        mDecryptAndVerify.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                decryptAndVerify(new Intent());
+            }
+        });
+        mGetKey.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getKey(new Intent());
+            }
+        });
+        mGetKeyIds.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getKeyIds(new Intent());
+            }
+        });
+
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
+        String providerPackageName = settings.getString("openpgp_provider_list", "");
+        if (TextUtils.isEmpty(providerPackageName)) {
+            Toast.makeText(this, "No OpenPGP Provider selected!", Toast.LENGTH_LONG).show();
+            finish();
+        } else {
+            // bind to service
+            mServiceConnection = new OpenPgpServiceConnection(
+                    OpenPgpProviderActivity.this, providerPackageName);
+            mServiceConnection.bindToService();
+        }
+    }
+
+    private void handleError(final OpenPgpError error) {
+        runOnUiThread(new Runnable() {
+
+            @Override
+            public void run() {
+                Toast.makeText(OpenPgpProviderActivity.this,
+                        "onError id:" + error.getErrorId() + "\n\n" + error.getMessage(),
+                        Toast.LENGTH_LONG).show();
+                Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
+                Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());
+            }
+        });
+    }
+
+    private void showToast(final String message) {
+        runOnUiThread(new Runnable() {
+
+            @Override
+            public void run() {
+                Toast.makeText(OpenPgpProviderActivity.this,
+                        message,
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    /**
+     * Takes input from message or ciphertext EditText and turns it into a ByteArrayInputStream
+     *
+     * @param ciphertext
+     * @return
+     */
+    private InputStream getInputstream(boolean ciphertext) {
+        InputStream is = null;
+        try {
+            String inputStr;
+            if (ciphertext) {
+                inputStr = mCiphertext.getText().toString();
+            } else {
+                inputStr = mMessage.getText().toString();
+            }
+            is = new ByteArrayInputStream(inputStr.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            Log.e(Constants.TAG, "UnsupportedEncodingException", e);
+        }
+
+        return is;
+    }
+
+    private class MyCallback implements OpenPgpApi.IOpenPgpCallback {
+        boolean returnToCiphertextField;
+        ByteArrayOutputStream os;
+        int requestCode;
+
+        private MyCallback(boolean returnToCiphertextField, ByteArrayOutputStream os, int requestCode) {
+            this.returnToCiphertextField = returnToCiphertextField;
+            this.os = os;
+            this.requestCode = requestCode;
+        }
+
+        @Override
+        public void onReturn(Intent result) {
+            switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {
+                case OpenPgpApi.RESULT_CODE_SUCCESS: {
+                    showToast("RESULT_CODE_SUCCESS");
+
+                    // encrypt/decrypt/sign/verify
+                    if (os != null) {
+                        try {
+                            Log.d(OpenPgpApi.TAG, "result: " + os.toByteArray().length
+                                    + " str=" + os.toString("UTF-8"));
+
+                            if (returnToCiphertextField) {
+                                mCiphertext.setText(os.toString("UTF-8"));
+                            } else {
+                                mMessage.setText(os.toString("UTF-8"));
+                            }
+                        } catch (UnsupportedEncodingException e) {
+                            Log.e(Constants.TAG, "UnsupportedEncodingException", e);
+                        }
+                    }
+
+                    // verify
+                    if (result.hasExtra(OpenPgpApi.RESULT_SIGNATURE)) {
+                        OpenPgpSignatureResult sigResult
+                                = result.getParcelableExtra(OpenPgpApi.RESULT_SIGNATURE);
+                        showToast(sigResult.toString());
+                    }
+
+                    // get key ids
+                    if (result.hasExtra(OpenPgpApi.RESULT_KEY_IDS)) {
+                        long[] keyIds = result.getLongArrayExtra(OpenPgpApi.RESULT_KEY_IDS);
+                        String out = "keyIds: ";
+                        for (int i = 0; i < keyIds.length; i++) {
+                            out += OpenPgpUtils.convertKeyIdToHex(keyIds[i]) + ", ";
+                        }
+
+                        showToast(out);
+                    }
+                    break;
+                }
+                case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: {
+                    showToast("RESULT_CODE_USER_INTERACTION_REQUIRED");
+
+                    PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
+                    try {
+                        OpenPgpProviderActivity.this.startIntentSenderForResult(pi.getIntentSender(),
+                                requestCode, null, 0, 0, 0);
+                    } catch (IntentSender.SendIntentException e) {
+                        Log.e(Constants.TAG, "SendIntentException", e);
+                    }
+                    break;
+                }
+                case OpenPgpApi.RESULT_CODE_ERROR: {
+                    showToast("RESULT_CODE_ERROR");
+
+                    OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR);
+                    handleError(error);
+                    break;
+                }
+            }
+        }
+    }
+
+    public void sign(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_SIGN);
+        data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+
+        InputStream is = getInputstream(false);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, is, os, new MyCallback(true, os, REQUEST_CODE_SIGN));
+    }
+
+    public void encrypt(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_ENCRYPT);
+        data.putExtra(OpenPgpApi.EXTRA_USER_IDS, mEncryptUserIds.getText().toString().split(","));
+        data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+
+        InputStream is = getInputstream(false);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, is, os, new MyCallback(true, os, REQUEST_CODE_ENCRYPT));
+    }
+
+    public void signAndEncrypt(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_SIGN_AND_ENCRYPT);
+        data.putExtra(OpenPgpApi.EXTRA_USER_IDS, mEncryptUserIds.getText().toString().split(","));
+        data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+
+        InputStream is = getInputstream(false);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, is, os, new MyCallback(true, os, REQUEST_CODE_SIGN_AND_ENCRYPT));
+    }
+
+    public void decryptAndVerify(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
+        data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+
+        InputStream is = getInputstream(true);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, is, os, new MyCallback(false, os, REQUEST_CODE_DECRYPT_AND_VERIFY));
+    }
+
+    public void getKey(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_GET_KEY);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+        data.putExtra(OpenPgpApi.EXTRA_KEY_ID, Long.decode(mGetKeyEdit.getText().toString()));
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, null, null, new MyCallback(false, null, REQUEST_CODE_GET_KEY));
+    }
+
+    public void getKeyIds(Intent data) {
+        data.setAction(OpenPgpApi.ACTION_GET_KEY_IDS);
+        data.putExtra(OpenPgpApi.EXTRA_ACCOUNT_NAME, mAccount.getText().toString());
+        data.putExtra(OpenPgpApi.EXTRA_USER_IDS, mGetKeyIdsEdit.getText().toString().split(","));
+
+        OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
+        api.executeApiAsync(data, null, null, new MyCallback(false, null, REQUEST_CODE_GET_KEY_IDS));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Log.d(Constants.TAG, "onActivityResult resultCode: " + resultCode);
+
+        // try again after user interaction
+        if (resultCode == RESULT_OK) {
+            /*
+             * The data originally given to one of the methods above, is again
+             * returned here to be used when calling the method again after user
+             * interaction. The Intent now also contains results from the user
+             * interaction, for example selected key ids.
+             */
+            switch (requestCode) {
+                case REQUEST_CODE_SIGN: {
+                    sign(data);
+                    break;
+                }
+                case REQUEST_CODE_ENCRYPT: {
+                    encrypt(data);
+                    break;
+                }
+                case REQUEST_CODE_SIGN_AND_ENCRYPT: {
+                    signAndEncrypt(data);
+                    break;
+                }
+                case REQUEST_CODE_DECRYPT_AND_VERIFY: {
+                    decryptAndVerify(data);
+                    break;
+                }
+                case REQUEST_CODE_GET_KEY: {
+                    getKey(data);
+                    break;
+                }
+                case REQUEST_CODE_GET_KEY_IDS: {
+                    getKeyIds(data);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (mServiceConnection != null) {
+            mServiceConnection.unbindFromService();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
index de5b0a581..9023320ae 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
@@ -47,6 +47,7 @@ public class PasswordFragment extends Fragment implements AbsListView.OnItemClic
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        System.out.println(PasswordRepository.getFilesList().size());
         mAdapter = new PasswordAdapter(getActivity(), PasswordRepository.getFilesList());
     }
 
@@ -82,7 +83,6 @@ public class PasswordFragment extends Fragment implements AbsListView.OnItemClic
         mListener = null;
     }
 
-
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         if (null != mListener) {
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/PasswordRepository.java
index cdbcb3b0f..30181e690 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordRepository.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordRepository.java
@@ -45,19 +45,11 @@ public class PasswordRepository {
     }
 
     public static ArrayList<String> getFilesList(){
-        // Avoid multiple queries
-        if (null == mainListOfFiles) {
-            mainListOfFiles = getFilesList(repository.getWorkTree());
-        }
-        return mainListOfFiles;
+        return getFilesList(repository.getWorkTree());
     }
 
     public static LinkedHashMap<String, ArrayList<String>> getPasswords() {
-        // avoid multiple queries
-        if (null == mainPasswordMap) {
-            mainPasswordMap = getPasswords(repository.getWorkTree());
-        }
-        return mainPasswordMap;
+        return getPasswords(repository.getWorkTree());
     }
 
     public static File getFile(String name) {
@@ -65,6 +57,8 @@ public class PasswordRepository {
     }
 
     public static ArrayList<String> getFilesList(File path){
+        if (!path.exists()) return new ArrayList<String>();
+
         List<File> files = (List<File>) FileUtils.listFiles(path, new String[] {"gpg"}, true);
         ArrayList<String> filePaths = new ArrayList<String>();
         for (File file : files) {
@@ -76,6 +70,9 @@ public class PasswordRepository {
     public static LinkedHashMap<String, ArrayList<String>> getPasswords(File path) {
         //We need to recover the passwords then parse the files
         ArrayList<String> passList = getFilesList(path);
+
+        if (passList.size() == 0) return new LinkedHashMap<String, ArrayList<String>>();
+
         LinkedHashMap<String, ArrayList<String>> passMap = new LinkedHashMap<String, ArrayList<String>>();
         passMap.put("Without Category", new ArrayList<String>());
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 8bbdcb4e8..6c9eb0b28 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -1,42 +1,28 @@
 package com.zeapo.pwdstore;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.Intent;
-import android.hardware.display.DisplayManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.apache.commons.io.filefilter.NotFileFilter;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.ListBranchCommand;
-import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.lib.RepositoryBuilder;
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.openintents.openpgp.util.OpenPgpListPreference;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
 
 
 public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentInteractionListener, PasswordFragment.OnFragmentInteractionListener {
+    private int listState = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -66,11 +52,17 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
-//        int id = item.getItemId();
-//        if (id == R.id.clone_setting) {
-//            getClone();
-//            return true;
-//        }
+        int id = item.getItemId();
+        if (id == R.id.user_pref) {
+            try {
+                Intent intent = new Intent(this, UserPreference.class);
+                startActivity(intent);
+            } catch (Exception e) {
+                System.out.println("Exception caught :(");
+                e.printStackTrace();
+            }
+            return true;
+        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -100,7 +92,7 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
         switch (status) {
             case 0:
                 ToCloneOrNot cloneFrag = new ToCloneOrNot();
-                fragmentTransaction.replace(R.id.main_layout, cloneFrag);
+                fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot");
                 fragmentTransaction.commit();
                 break;
             case 1:
@@ -108,7 +100,12 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
                 break;
             default:
                 PasswordFragment passFrag = new PasswordFragment();
-                fragmentTransaction.replace(R.id.main_layout, passFrag);
+
+                if (fragmentManager.findFragmentByTag("ToCloneOrNot") == null) {
+                    fragmentTransaction.add(R.id.main_layout, passFrag);
+                } else {
+                    fragmentTransaction.replace(R.id.main_layout, passFrag);
+                }
                 fragmentTransaction.commit();
         }
     }
@@ -117,12 +114,22 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
     @Override
     public void onFragmentInteraction(String id) {
 
+        Intent intent = new Intent(this, PgpHandler.class);
+        intent.putExtra("FILE_NAME", id);
+        startActivity(intent);
+
         try {
-            for (String l : (List<String>) FileUtils.readLines(PasswordRepository.getFile(id), null)) {
-                System.out.println(l);
+            byte[] data = new byte[0];
+            try {
+                data = FileUtils.readFileToByteArray(PasswordRepository.getFile(id));
+
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-        } catch (IOException e) {
-            //TODO handle problems
+
+
+        } catch (Exception e) {
+//            TODO handle problems
             e.printStackTrace();
         }
     }
diff --git a/app/src/main/java/com/zeapo/pwdstore/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/PgpHandler.java
new file mode 100644
index 000000000..22a6f8ccc
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/PgpHandler.java
@@ -0,0 +1,56 @@
+package com.zeapo.pwdstore;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TextView;
+
+import com.zeapo.pwdstore.R;
+
+import org.openintents.openpgp.util.OpenPgpServiceConnection;
+
+public class PgpHandler extends Activity {
+
+
+    private OpenPgpServiceConnection mServiceConnection;
+
+    public static final int REQUEST_CODE_SIGN = 9910;
+    public static final int REQUEST_CODE_ENCRYPT = 9911;
+    public static final int REQUEST_CODE_SIGN_AND_ENCRYPT = 9912;
+    public static final int REQUEST_CODE_DECRYPT_AND_VERIFY = 9913;
+    public static final int REQUEST_CODE_GET_KEY = 9914;
+    public static final int REQUEST_CODE_GET_KEY_IDS = 9915;
+
+    public final class Constants {
+        public static final String TAG = "Keychain";
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pgp_handler);
+        Bundle extra = getIntent().getExtras();
+        ((TextView) findViewById(R.id.hhh)).setText(extra.getString("FILE_NAME"));
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.pgp_handler, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
new file mode 100644
index 000000000..cc6c1495a
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -0,0 +1,13 @@
+package com.zeapo.pwdstore;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+
+public class UserPreference extends PreferenceActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preference);
+    }
+}
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
new file mode 100644
index 000000000..5a8767667
--- /dev/null
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -0,0 +1,17 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.zeapo.pwdstore.PgpHandler">
+
+    <TextView
+        android:id="@+id/hhh"
+        android:text="@string/hello_world"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/openpgp_provider.xml b/app/src/main/res/layout/openpgp_provider.xml
new file mode 100644
index 000000000..f7c46b5f0
--- /dev/null
+++ b/app/src/main/res/layout/openpgp_provider.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/parent_scroll"
+android:fillViewport="true"
+android:layout_width="match_parent"
+android:layout_height="match_parent">
+
+<LinearLayout
+    android:padding="8dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Encrypt UserIds (split with &apos;,&apos;)"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+    <EditText
+        android:id="@+id/crypto_provider_demo_encrypt_user_id"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="dominik@dominikschuermann.de"
+        android:textAppearance="@android:style/TextAppearance.Small" />
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Message"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+    <ScrollView
+        android:id="@+id/child_scroll1"
+        android:fillViewport="true"
+        android:layout_width="match_parent"
+        android:layout_height="120dp">
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollHorizontally="true"
+            android:scrollbars="vertical"
+            android:text="message"
+            android:hint="cleartext message"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+    </ScrollView>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Ciphertext"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <ScrollView
+        android:id="@+id/child_scroll2"
+        android:fillViewport="true"
+        android:layout_width="match_parent"
+        android:layout_height="120dp">
+
+        <EditText
+            android:id="@+id/crypto_provider_demo_ciphertext"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="ciphertext"
+            android:hint="ciphertext"
+            android:textAppearance="@android:style/TextAppearance.Small" />
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/crypto_provider_demo_sign"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Sign"
+            android:layout_gravity="center_vertical" />
+
+        <Button
+            android:id="@+id/crypto_provider_demo_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Encrypt"
+            android:layout_gravity="center_vertical" />
+
+        <Button
+            android:id="@+id/crypto_provider_demo_sign_and_encrypt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Sign and Encrypt"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/crypto_provider_demo_decrypt_and_verify"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Decrypt and Verify" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Account ID:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Alice &lt;alice@example.com&gt;"
+        android:id="@+id/crypto_provider_demo_account" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Get key:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="0x718c070100012282"
+        android:id="@+id/crypto_provider_demo_get_key_edit" />
+
+    <Button
+        android:id="@+id/crypto_provider_demo_get_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Get key" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Get key ids:"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="dominik@dominikschuermann.de"
+        android:id="@+id/crypto_provider_demo_get_key_ids_edit" />
+
+    <Button
+        android:id="@+id/crypto_provider_demo_get_key_ids"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Get key ids" />
+
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/agp_intents.xml b/app/src/main/res/menu/agp_intents.xml
new file mode 100644
index 000000000..591b95258
--- /dev/null
+++ b/app/src/main/res/menu/agp_intents.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.zeapo.pwdstore.AgpIntentsActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
new file mode 100644
index 000000000..bf981e24a
--- /dev/null
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.zeapo.pwdstore.PgpHandler" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index 7dc96cff1..a9c41638f 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -1,4 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".pwdstore" >
+
+    <item android:id="@+id/user_pref"
+        android:title="Settings"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:icon="@android:drawable/ic_menu_manage"/>
 </menu>
diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml
new file mode 100644
index 000000000..975e10faf
--- /dev/null
+++ b/app/src/main/res/values-large/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_grid</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/refs.xml b/app/src/main/res/values-sw600dp/refs.xml
new file mode 100644
index 000000000..975e10faf
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_grid</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1e27627b3..b0a3dc7c6 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -9,4 +9,30 @@
         <item>https://</item>
         <item>http://</item>
     </string-array>
+
+    <string-array name="updateInterval">
+
+        <item name="1000">Every 1 second</item>
+
+        <item name="5000">Every 5 seconds</item>
+
+        <item name="30000">Every 30 seconds</item>
+
+        <item name="60000">Every 1 minute</item>
+
+        <item name="300000">Every 5 minutes</item>
+    </string-array>
+
+    <string-array name="updateIntervalValues">
+
+        <item name="1000">1000</item>
+
+        <item name="5000">5000</item>
+
+        <item name="30000">30000</item>
+
+        <item name="60000">60000</item>
+
+        <item name="300000">300000</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
new file mode 100644
index 000000000..46592ab7c
--- /dev/null
+++ b/app/src/main/res/values/refs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+    Layout alias to replace the single-pane version of the layout with a
+    two-pane version on Large screens.
+
+    For more on layout aliases, see:
+    http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
+    -->
+
+    <item name="fragment_password" type="layout">@layout/fragment_password_list</item>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ff38c1c3..c7e63c85c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory?</string>
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
-
+    <string name="title_activity_git_clone">Clone repository</string>
 
     <!-- Clone fragment -->
     <string name="clone_fragment_text">Password store empty</string>
@@ -22,5 +22,6 @@
     <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>
     <string name="insufficient_apg_permissions">Password Store doesn\'t have permission to access APG fully, please reinstall Password Store to fix that.</string>
     <string name="title_activity_agp_intents">AgpIntentsActivity</string>
+    <string name="title_activity_pgp_handler">PgpHandler</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings_activity_git_clone.xml b/app/src/main/res/values/strings_activity_git_clone.xml
deleted file mode 100644
index bde00dba3..000000000
--- a/app/src/main/res/values/strings_activity_git_clone.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resources>
-        <string name="title_activity_git_clone">Clone Repository</string>
-
-    <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password (optional)</string>
-    <string name="action_sign_in">Sign in or register</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="plus_sign_out">Switch Google+ account</string>
-    <string name="plus_disconnect">Disconnect from Google+</string>
-    <string name="error_invalid_email">This email address is invalid</string>
-    <string name="error_invalid_password">This password is too short</string>
-    <string name="error_incorrect_password">This password is incorrect</string>
-    <string name="error_field_required">This field is required</string>
-</resources>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
new file mode 100644
index 000000000..402a1bd33
--- /dev/null
+++ b/app/src/main/res/xml/preference.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="Crypto">
+        <org.openintents.openpgp.util.OpenPgpListPreference
+            android:key="openpgp_provider_list"
+            android:title="Select OpenPGP Provider!" />
+        <Preference
+            android:key="openpgp_provider_demo"
+            android:title="OpenPGP Provider Demo" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file