diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 736c7b5cf..6a2ce86fb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -9,6 +9,8 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/libraries" />
+            <option value="$PROJECT_DIR$/libraries/openpgp-api-lib" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d9a6a2e40..c9aff0599 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/PwdStore.iml" filepath="$PROJECT_DIR$/PwdStore.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" filepath="$PROJECT_DIR$/libraries/openpgp-api-lib/openpgp-api-lib.iml" />
     </modules>
   </component>
 </project>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 000000000..1e27627b3
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="connection_modes">
+        <item>username/password</item>
+        <item>ssh-key</item>
+    </string-array>
+    <string-array name="clone_protocols">
+        <item>ssh://</item>
+        <item>https://</item>
+        <item>http://</item>
+    </string-array>
+</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 d3e70a689..3ff38c1c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string name="app_name">PwdStore</string>
-
     <string name="clone_settings">Clone</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
@@ -11,21 +10,17 @@
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
 
-    <string-array name="connection_modes">
-        <item>username/password</item>
-        <item>ssh-key</item>
-    </string-array>
-    <string-array name="clone_protocols">
-        <item>ssh://</item>
-        <item>https://</item>
-        <item>http://</item>
-    </string-array>
 
     <!-- Clone fragment -->
     <string name="clone_fragment_text">Password store empty</string>
     <string name="clone">Clone a git repository</string>
     <string name="initialize">Initialize a git repository</string>
-
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
+    <!-- APG related -->
+    <string name="error_activity_not_found">No suitable application for this action found.</string>
+    <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>
+
 </resources>
diff --git a/settings.gradle b/settings.gradle
index e7b4def49..f4604744b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':libraries:openpgp-api-lib'