diff --git a/CHANGES.md b/CHANGES.md
index e2cd2915b5..35f4a23804 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,8 @@ Improvements 🙌:
  - The initial sync is now handled by a foreground service
  - Render aliases and canonical alias change in the timeline
  - Fix autocompletion issues and add support for rooms and groups
+ - Introduce developer mode in the settings (#796)
+ - Improve devices list screen
 
 Other changes:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index d537b66ec3..d08a891081 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -42,6 +42,7 @@ import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventForm
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.riotx.features.html.EventHtmlRenderer
 import im.vector.riotx.features.html.VectorHtmlCompressor
+import im.vector.riotx.features.settings.VectorPreferences
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -86,7 +87,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                                                           private val htmlCompressor: VectorHtmlCompressor,
                                                           private val session: Session,
                                                           private val noticeEventFormatter: NoticeEventFormatter,
-                                                          private val stringProvider: StringProvider
+                                                          private val stringProvider: StringProvider,
+                                                          private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<MessageActionState, MessageActionsAction>(initialState) {
 
     private val eventId = initialState.eventId
@@ -268,12 +270,15 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     }
                 }
 
-                add(EventSharedAction.ViewSource(event.root.toContentStringWithIndent()))
-                if (event.isEncrypted()) {
-                    val decryptedContent = event.root.toClearContentStringWithIndent()
-                            ?: stringProvider.getString(R.string.encryption_information_decryption_error)
-                    add(EventSharedAction.ViewDecryptedSource(decryptedContent))
+                if (vectorPreferences.developerMode()) {
+                    add(EventSharedAction.ViewSource(event.root.toContentStringWithIndent()))
+                    if (event.isEncrypted()) {
+                        val decryptedContent = event.root.toClearContentStringWithIndent()
+                                ?: stringProvider.getString(R.string.encryption_information_decryption_error)
+                        add(EventSharedAction.ViewDecryptedSource(decryptedContent))
+                    }
                 }
+
                 add(EventSharedAction.CopyPermalink(eventId))
 
                 if (session.myUserId != event.root.senderId) {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
index c3b07c7496..63b7c60bef 100755
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
@@ -147,6 +147,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
 
+        private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
         private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
 
@@ -245,8 +246,12 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         }
     }
 
+    fun developerMode(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY, false)
+    }
+
     fun shouldShowHiddenEvents(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY, false)
+        return developerMode() && defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY, false)
     }
 
     fun swipeToReplyIsEnabled(): Boolean {
@@ -254,7 +259,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     fun labAllowedExtendedLogging(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_ALLOW_EXTENDED_LOGS, false)
+        return developerMode() && defaultPrefs.getBoolean(SETTINGS_LABS_ALLOW_EXTENDED_LOGS, false)
     }
 
     /**
diff --git a/vector/src/main/res/xml/vector_settings_developer_mode.xml b/vector/src/main/res/xml/vector_settings_developer_mode.xml
index 1f81e2e659..8ceb03f323 100644
--- a/vector/src/main/res/xml/vector_settings_developer_mode.xml
+++ b/vector/src/main/res/xml/vector_settings_developer_mode.xml
@@ -4,19 +4,19 @@
 
     <im.vector.riotx.core.preference.VectorSwitchPreference
         android:defaultValue="false"
-        android:key="SETTINGS_DEVELOPER_MODE_KEY"
+        android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         android:summary="@string/settings_developer_mode_summary"
         android:title="@string/settings_developer_mode" />
 
     <im.vector.riotx.core.preference.VectorSwitchPreference
         android:defaultValue="false"
-        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
         android:title="@string/settings_labs_show_hidden_events_in_timeline" />
 
     <im.vector.riotx.core.preference.VectorSwitchPreference
         android:defaultValue="false"
-        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         android:key="SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
         android:summary="@string/labs_allow_extended_logging_summary"
         android:title="@string/labs_allow_extended_logging" />
@@ -24,7 +24,7 @@
     <!-- TODO Display unsupported events -->
 
     <im.vector.riotx.core.preference.VectorPreferenceCategory
-        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         android:title="@string/settings_notifications">
 
         <im.vector.riotx.core.preference.VectorPreference