             if !self.showDecryptedContentInNotifications {
                 //  do not show decrypted content in notification
                 NSLog("[NotificationService] fetchEvent: Do not show decrypted content in notifications.")
-                self.fallbackToOriginalContent()
+                self.fallbackToOriginalContent(forEventId: event.eventId)
                 return
             }
             


class NotificationService: UNNotificationServiceExtension {
    
    var contentHandler: ((UNNotificationContent) -> Void)?
    var originalContent: UNMutableNotificationContent?
    
    var cachedEvent: MXEvent?

                    break
                case .failure(let error):
                    NSLog("[NotificationService] setup: MXSession.setStore method returned error: \(String(describing: error))")
                    self.fallbackToOriginalContent(forEventId: eventId)
                    break
                }
            })
        } else {
            NSLog("[NotificationService] setup: No active accounts")
            fallbackToOriginalContent(forEventId: eventId)
        }
    }
    
    func fetchEvent(withEventId eventId: String) {
        guard let content = originalContent, let mxSession = mxSession else {
            //  there is something wrong, do not change the content
            NSLog("[NotificationService] fetchEvent: Either originalContent or mxSession is missing.")
            fallbackToOriginalContent(forEventId: eventId)
            return
        }
        let userInfo = content.userInfo
        
        guard let roomId = userInfo["room_id"] as? String else {
            //  it's not a Matrix notification, do not change the content
            NSLog("[NotificationService] fetchEvent: This is not a Matrix notification.")
            contentHandlers[eventId]?(content)
            return
        }
        
