diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 84e2e3c7b..eae2723ad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -395,7 +395,7 @@
                 android:value=".FDroid" />
         </activity>
         <activity
-            android:name="org.fdroid.fdroid.CrashReportActivity"
+            android:name=".acra.CrashReportActivity"
             android:theme="@style/AppThemeDark"
             android:process=":error_report"
             android:launchMode="singleInstance"
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 36ca94057..610779db5 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -71,7 +71,7 @@ import sun.net.www.protocol.bluetooth.Handler;
 
 @ReportsCrashes(mailTo = "reports@f-droid.org",
         mode = ReportingInteractionMode.DIALOG,
-        reportDialogClass = CrashReportActivity.class,
+        reportDialogClass = org.fdroid.fdroid.acra.CrashReportActivity.class,
         reportSenderFactoryClasses = org.fdroid.fdroid.acra.CrashReportSenderFactory.class
 )
 public class FDroidApp extends Application {
diff --git a/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java
similarity index 88%
rename from app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java
rename to app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java
index 86875b4a2..039ad75c8 100644
--- a/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportActivity.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.acra;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -6,8 +6,10 @@ import android.support.v7.app.AlertDialog;
 import android.widget.EditText;
 
 import org.acra.dialog.BaseCrashReportDialog;
+import org.fdroid.fdroid.R;
 
-public class CrashReportActivity extends BaseCrashReportDialog implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener {
+public class CrashReportActivity extends BaseCrashReportDialog
+        implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener {
 
     private static final String STATE_COMMENT = "comment";
     private EditText comment;