diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
index 163cdb4..2746d2a 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
@@ -13,6 +13,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.SubMenu;
 import android.widget.Toast;
 
 import org.communiquons.android.comunic.client.BuildConfig;
@@ -25,6 +26,7 @@ import org.communiquons.android.comunic.client.data.helpers.DatabaseHelper;
 import org.communiquons.android.comunic.client.data.helpers.ConversationsListHelper;
 import org.communiquons.android.comunic.client.data.runnables.FriendRefreshLoopRunnable;
 import org.communiquons.android.comunic.client.data.services.NotificationsService;
+import org.communiquons.android.comunic.client.data.utils.PreferencesUtils;
 import org.communiquons.android.comunic.client.ui.fragments.SinglePostFragment;
 import org.communiquons.android.comunic.client.ui.fragments.UserAccessDeniedFragment;
 import org.communiquons.android.comunic.client.ui.listeners.onOpenUsersPageListener;
@@ -164,6 +166,13 @@ public class MainActivity extends AppCompatActivity implements openConversationL
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_menu, menu);
+
+        //Check if the debug menu has to be shown or not
+        if(PreferencesUtils.getBoolean(this, "enable_debug_mode", false)) {
+            SubMenu debugMenu = menu.addSubMenu(R.string.menu_debug_title);
+            getMenuInflater().inflate(R.menu.debug_menu, debugMenu);
+        }
+
         return true;
     }
 
diff --git a/app/src/main/res/menu/debug_menu.xml b/app/src/main/res/menu/debug_menu.xml
new file mode 100644
index 0000000..9a3675b
--- /dev/null
+++ b/app/src/main/res/menu/debug_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/clear_local_db"
+        android:title="@string/menu_clear_local_db"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index a11a666..30d362a 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -16,7 +16,7 @@
     <item
         android:id="@+id/action_logout"
         android:title="@string/main_menu_logout"
-        android:orderInCategory="100"
+        android:orderInCategory="101"
         app:showAsAction="never"/>
 
 </menu>
\ 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 ed2fcf9..4353ae8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,4 +178,8 @@
     <string name="notice_no_conversation">You do not have any conversation yet.</string>
     <string name="notice_no_friend">You do not have any friend yet.</string>
     <string name="err_get_older_conversation_messages">An error occurred while trying to get older messages for the conversation!</string>
+    <string name="preference_debug_mode_title">Enable debug mode</string>
+    <string name="preference_debug_mode_summary">Enable this option to get access to development / debug features.</string>
+    <string name="menu_debug_title">Debug</string>
+    <string name="menu_clear_local_db">Clear local database</string>
 </resources>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index 1c65125..8eeb7d4 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -8,4 +8,12 @@
         android:title="@string/preference_background_notif_title"
         android:summary="@string/preference_background_notif_summary"/>
 
+
+    <!-- Enable and / or disable debug mode -->
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="enable_debug_mode"
+        android:title="@string/preference_debug_mode_title"
+        android:summary="@string/preference_debug_mode_summary" />
+
 </PreferenceScreen>
\ No newline at end of file