diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
index 33a94de61..5e8ecfb22 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
+++ b/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java
@@ -17,25 +17,20 @@
 package org.sufficientlysecure.keychain.demo;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.PendingIntent;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.SharedPreferences;
-import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ListAdapter;
-import android.widget.TextView;
+import android.widget.ScrollView;
 import android.widget.Toast;
 
 import org.openintents.openpgp.OpenPgpError;
@@ -47,8 +42,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
 
 public class OpenPgpProviderActivity extends Activity {
     EditText mMessage;
diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml b/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml
index 6647a417b..80fd16780 100644
--- a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml
+++ b/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml
@@ -1,79 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    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" />
-
-    <EditText
-        android:id="@+id/crypto_provider_demo_message"
-        android:layout_width="match_parent"
-        android:layout_height="100dip"
-        android:scrollHorizontally="true"
-        android:scrollbars="vertical"
-        android:text="message"
-        android:textAppearance="@android:style/TextAppearance.Small" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Ciphertext"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <EditText
-        android:id="@+id/crypto_provider_demo_ciphertext"
-        android:layout_width="match_parent"
-        android:layout_height="100dip"
-        android:text="ciphertext"
-        android:textAppearance="@android:style/TextAppearance.Small" />
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-
-        <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" />
-
-        <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" />
-
-        <Button
-            android:id="@+id/crypto_provider_demo_sign_and_encrypt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Sign and Encrypt" />
-    </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" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <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: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: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" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file