     func notificationCategoryIdentifier(forEvent event: MXEvent) -> String? {
         let isNotificationContentShown = !event.isEncrypted || self.showDecryptedContentInNotifications
         
-        var categoryIdentifier: String?
-        
-        if (event.eventType == .roomMessage || event.eventType == .roomEncrypted) && isNotificationContentShown {
-            categoryIdentifier = "QUICK_REPLY"
-        }
-        
-        return categoryIdentifier
+        guard isNotificationContentShown else {
+            return nil
+        }
+        
+        guard event.eventType == .roomMessage || event.eventType == .roomEncrypted else {
+            return nil
+        }
+        
+        return "QUICK_REPLY"
     }
     
 }

        })
    }
    
    func notificationContent(withTitle title: String?, body: String?, threadIdentifier: String?, userId: String?, event: MXEvent, pushRule: MXPushRule?) -> UNNotificationContent {
        let notificationContent = UNMutableNotificationContent()
        
        if let title = title {

    
    func fallbackToOriginalContent() {
        store?.close()
        guard let content = originalContent else {
            NSLog("[NotificationService] Fallback case 13")
            return
        }
        
        //  call contentHandler
        contentHandler?(content)
    }
    
    func notificationContent(forEvent event: MXEvent, inAccount account: MXKAccount, onComplete: @escaping (UNNotificationContent?) -> Void) {
