diff --git a/res/menu/log_submit.xml b/res/menu/log_submit.xml
index da663ffc16..abd321d48d 100644
--- a/res/menu/log_submit.xml
+++ b/res/menu/log_submit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/text_secure_normal__submit_debug_log"
+    <item android:title="@string/preferences__submit_debug_log"
           android:id="@+id/menu_submit_debug_logs"
           android:icon="@android:drawable/ic_menu_upload" />
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 92da7234e1..89298a953d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -713,6 +713,8 @@
     <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is currently your default SMS app. Please set another default SMS app first to change this preference.</string>
     <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Send and receive SMS messages when push is not available</string>
     <string name="preferences__refresh_push_directory">Refresh Push Directory</string>
+    <string name="preferences__submit_debug_log">Submit debug log</string>
+
 
     <!-- **************************************** -->
     <!-- menus -->
@@ -783,7 +785,6 @@
     <string name="text_secure_normal__menu_settings">Settings</string>
     <string name="text_secure_normal__menu_clear_passphrase">Lock</string>
     <string name="text_secure_normal__mark_all_as_read">Mark All Read</string>
-    <string name="text_secure_normal__submit_debug_log">Submit debug log</string>
 
     <!-- verify_keys -->
     <string name="verify_keys__menu_verified">Verified</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index fa830d847b..d47e4c8916 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -177,5 +177,8 @@
         <Preference android:key="pref_update_directory"
                     android:title="@string/preferences__refresh_push_directory"/>
 
+        <Preference android:key="pref_submit_debug_logs"
+                    android:title="@string/preferences__submit_debug_log"/>
+
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index ef8f54885f..df271f6b3e 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -84,6 +84,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
   private static final String MMS_PREF              = "pref_mms_preferences";
   private static final String KITKAT_DEFAULT_PREF   = "pref_set_default";
   private static final String UPDATE_DIRECTORY_PREF = "pref_update_directory";
+  private static final String SUBMIT_DEBUG_LOG_PREF = "pref_submit_debug_logs";
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@@ -122,6 +123,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
       .setOnPreferenceChangeListener(new RingtoneSummaryListener());
     this.findPreference(UPDATE_DIRECTORY_PREF)
         .setOnPreferenceClickListener(new DirectoryUpdateListener());
+    this.findPreference(SUBMIT_DEBUG_LOG_PREF)
+        .setOnPreferenceClickListener(new SubmitDebugLogListener());
 
     initializeListSummary((ListPreference) findPreference(TextSecurePreferences.LED_COLOR_PREF));
     initializeListSummary((ListPreference) findPreference(TextSecurePreferences.LED_BLINK_PREF));
@@ -576,6 +579,15 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
     }
   }
 
+  private class SubmitDebugLogListener implements Preference.OnPreferenceClickListener {
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+      final Intent intent = new Intent(ApplicationPreferencesActivity.this, LogSubmitActivity.class);
+      startActivity(intent);
+      return true;
+    }
+  }
+
   /* http://code.google.com/p/android/issues/detail?id=4611#c35 */
   @SuppressWarnings("deprecation")
   @Override
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 5dc674df29..0455e5f28b 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -109,7 +109,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     menu.clear();
 
     inflater.inflate(R.menu.text_secure_normal, menu);
-    inflater.inflate(R.menu.log_submit, menu);
 
     menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(this));
 
@@ -153,7 +152,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     case R.id.menu_settings:          handleDisplaySettings();        return true;
     case R.id.menu_clear_passphrase:  handleClearPassphrase();        return true;
     case R.id.menu_mark_all_read:     handleMarkAllRead();            return true;
-    case R.id.menu_submit_debug_logs: handleLogSubmit();              return true;
     case android.R.id.home:           handleNavigationDrawerToggle(); return true;
     }
 
@@ -187,11 +185,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     startActivity(intent);
   }
 
-  private void handleLogSubmit() {
-    Intent intent = new Intent(this, LogSubmitActivity.class);
-    startActivity(intent);
-  }
-
   private void handleNavigationDrawerToggle() {
     if (drawerLayout.isDrawerOpen(drawerList)) {
       drawerLayout.closeDrawer(drawerList);