     }
     
     func fetchEvent(withEventId eventId: String) {
-        guard let content = originalContents[eventId], let mxSession = mxSession else {
+        guard let content = originalContents[eventId], let mxSession = NotificationService.mxSession else {
             //  there is something wrong, do not change the content
             NSLog("[NotificationService] fetchEvent: Either originalContent or mxSession is missing.")
             fallbackToOriginalContent(forEventId: eventId)

    }
    
    func processEvent(_ event: MXEvent) {
        guard let content = originalContents[event.eventId], let mxSession = mxSession else {
            self.fallbackToOriginalContent(forEventId: event.eventId)
            return
        }

    }
    
    func launchBackgroundSync(forEventId eventId: String) {
        guard let mxSession = NotificationService.mxSession else {
            NSLog("[NotificationService] launchBackgroundSync: mxSession is missing.")
            self.fallbackToOriginalContent(forEventId: eventId)
            return
