diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
index 14d64d44..07891b80 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
@@ -18,6 +18,8 @@ package im.vector.riotx.features.notifications
 import androidx.core.app.NotificationCompat
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
+import im.vector.matrix.android.api.session.crypto.CryptoService
+import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.toModel
@@ -25,11 +27,13 @@ import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomMember
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
+import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
 import im.vector.riotx.BuildConfig
 import im.vector.riotx.R
 import im.vector.riotx.core.resources.StringProvider
 import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
 import timber.log.Timber
+import java.util.*
 import javax.inject.Inject
 
 /**
@@ -39,7 +43,8 @@ import javax.inject.Inject
  * this pattern allow decoupling between the object responsible of displaying notifications and the matrix sdk.
  */
 class NotifiableEventResolver @Inject constructor(private val stringProvider: StringProvider,
-                                                  private val noticeEventFormatter: NoticeEventFormatter) {
+                                                  private val noticeEventFormatter: NoticeEventFormatter,
+                                                  private val cryptoService: CryptoService) {
 
     //private val eventDisplay = RiotEventDisplay(context)
 
@@ -110,6 +115,22 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
             notifiableEvent.matrixID = session.sessionParams.credentials.userId
             return notifiableEvent
         } else {
+            if (event.root.isEncrypted() && event.root.mxDecryptionResult == null) {
+                //TODO use a global event decryptor? attache to session and that listen to new sessionId?
+                //for now decrypt sync
+                try {
+                    val result = cryptoService.decryptEvent(event.root, event.root.roomId + UUID.randomUUID().toString())
+                    event.root.mxDecryptionResult = OlmDecryptionResult(
+                            payload = result.clearEvent,
+                            senderKey = result.senderCurve25519Key,
+                            keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
+                            forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                    )
+                } catch (e: MXCryptoError) {
+
+                }
+            }
+
             val body = event.annotations?.editSummary?.aggregatedContent?.toModel<MessageContent>()?.body
                     ?: event.root.getClearContent().toModel<MessageContent>()?.body
                     ?: stringProvider.getString(R.string.notification_unknown_new_event)