diff --git a/APG/src/org/thialfihar/android/apg/compatibility/Clipboard.java b/APG/src/org/thialfihar/android/apg/compatibility/Clipboard.java
deleted file mode 100644
index 7d1b014fe..000000000
--- a/APG/src/org/thialfihar/android/apg/compatibility/Clipboard.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.thialfihar.android.apg.compatibility;
-
-import java.lang.reflect.Method;
-
-import android.content.Context;
-import org.thialfihar.android.apg.util.Log;
-
-public class Clipboard {
-
-    private static final String clipboardLabel = "APG";
-
-    /**
-     * Wrapper around ClipboardManager based on Android version using Reflection API
-     * 
-     * @param context
-     * @param text
-     */
-    public static void copyToClipboard(Context context, String text) {
-        Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
-        try {
-            if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
-                Method methodSetText = clipboard.getClass()
-                        .getMethod("setText", CharSequence.class);
-                methodSetText.invoke(clipboard, text);
-            } else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
-                Class<?> classClipData = Class.forName("android.content.ClipData");
-                Method methodNewPlainText = classClipData.getMethod("newPlainText",
-                        CharSequence.class, CharSequence.class);
-                Object clip = methodNewPlainText.invoke(null, clipboardLabel, text);
-                methodNewPlainText = clipboard.getClass()
-                        .getMethod("setPrimaryClip", classClipData);
-                methodNewPlainText.invoke(clipboard, clip);
-            }
-        } catch (Exception e) {
-            Log.e("ProjectsException", "There was and error copying the text to the clipboard: "
-                    + e.getMessage());
-        }
-    }
-
-    /**
-     * Wrapper around ClipboardManager based on Android version using Reflection API
-     * 
-     * @param context
-     * @param text
-     */
-    public static CharSequence getClipboardText(Context context) {
-        Object clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE);
-        try {
-            if ("android.text.ClipboardManager".equals(clipboard.getClass().getName())) {
-                // CharSequence text = clipboard.getText();
-                Method methodGetText = clipboard.getClass().getMethod("getText");
-                Object text = methodGetText.invoke(clipboard);
-
-                return (CharSequence) text;
-            } else if ("android.content.ClipboardManager".equals(clipboard.getClass().getName())) {
-                // ClipData clipData = clipboard.getPrimaryClip();
-                Method methodGetPrimaryClip = clipboard.getClass().getMethod("getPrimaryClip");
-                Object clipData = methodGetPrimaryClip.invoke(clipboard);
-
-                // ClipData.Item clipDataItem = clipData.getItemAt(0);
-                Method methodGetItemAt = clipData.getClass().getMethod("getItemAt", int.class);
-                Object clipDataItem = methodGetItemAt.invoke(clipData, 0);
-
-                // CharSequence text = clipDataItem.coerceToText(context);
-                Method methodGetString = clipDataItem.getClass().getMethod("coerceToText",
-                        Context.class);
-                Object text = methodGetString.invoke(clipDataItem, context);
-
-                return (CharSequence) text;
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            Log.e("ProjectsException", "There was and error getting the text from the clipboard: "
-                    + e.getMessage());
-
-            return null;
-        }
-    }
-}
diff --git a/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
index 4c669789b..671b2b48e 100644
--- a/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
@@ -20,7 +20,7 @@ package org.thialfihar.android.apg.ui;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.thialfihar.android.apg.Constants;
 import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.compatibility.Clipboard;
+import org.thialfihar.android.apg.compatibility.ClipboardReflection;
 import org.thialfihar.android.apg.helper.FileHelper;
 import org.thialfihar.android.apg.helper.OtherHelper;
 import org.thialfihar.android.apg.helper.PGPHelper;
@@ -264,7 +264,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
         if (mSource.getCurrentView().getId() == R.id.sourceMessage
                 && mMessage.getText().length() == 0) {
 
-            CharSequence clipboardText = Clipboard.getClipboardText(this);
+            CharSequence clipboardText = ClipboardReflection.getClipboardText(this);
 
             String data = "";
             if (clipboardText != null) {
diff --git a/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java b/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
index dab14de0d..b0c6aa957 100644
--- a/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
+++ b/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
@@ -23,7 +23,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.thialfihar.android.apg.Constants;
 import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.compatibility.Clipboard;
+import org.thialfihar.android.apg.compatibility.ClipboardReflection;
 import org.thialfihar.android.apg.helper.FileHelper;
 import org.thialfihar.android.apg.helper.OtherHelper;
 import org.thialfihar.android.apg.helper.PGPHelper;
@@ -758,7 +758,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
                     case Id.target.clipboard:
                         output = data.getString(ApgIntentService.RESULT_ENCRYPTED_STRING);
                         Log.d(Constants.TAG, "output: " + output);
-                        Clipboard.copyToClipboard(EncryptActivity.this, output);
+                        ClipboardReflection.copyToClipboard(EncryptActivity.this, output);
                         Toast.makeText(EncryptActivity.this,
                                 R.string.encryptionToClipboardSuccessful, Toast.LENGTH_SHORT)
                                 .show();