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 da2da452ab..5212e1469d 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
@@ -297,20 +297,20 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     }
                 }
 
-                if (timelineEvent.isEncrypted() && timelineEvent.root.mCryptoError != null) {
-                    val keysBackupService = session.cryptoService().keysBackupService()
-                    if (keysBackupService.state == KeysBackupState.NotTrusted
-                            || (keysBackupService.state == KeysBackupState.ReadyToBackUp
-                                    && keysBackupService.canRestoreKeys())
-                    ) {
-                        add(EventSharedAction.UseKeyBackup)
-                    }
-                    if (session.cryptoService().getCryptoDeviceInfo(session.myUserId).size > 1) {
-                        add(EventSharedAction.ReRequestKey(timelineEvent.eventId))
-                    }
-                }
-
                 if (vectorPreferences.developerMode()) {
+                    if (timelineEvent.isEncrypted() && timelineEvent.root.mCryptoError != null) {
+                        val keysBackupService = session.cryptoService().keysBackupService()
+                        if (keysBackupService.state == KeysBackupState.NotTrusted
+                                || (keysBackupService.state == KeysBackupState.ReadyToBackUp
+                                        && keysBackupService.canRestoreKeys())
+                        ) {
+                            add(EventSharedAction.UseKeyBackup)
+                        }
+                        if (session.cryptoService().getCryptoDeviceInfo(session.myUserId).size > 1) {
+                            add(EventSharedAction.ReRequestKey(timelineEvent.eventId))
+                        }
+                    }
+
                     add(EventSharedAction.ViewSource(timelineEvent.root.toContentStringWithIndent()))
                     if (timelineEvent.isEncrypted() && timelineEvent.root.mxDecryptionResult != null) {
                         val decryptedContent = timelineEvent.root.toClearContentStringWithIndent()