     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 fallbackToOriginalContent() {
        store?.close()
        if let content = originalContent {
            contentHandler?(content)
        } else {
            NSLog("[NotificationService] Fallback case 13")
        }
    }
    
    func notificationContent(forEvent event: MXEvent, inAccount account: MXKAccount, onComplete: @escaping (UNNotificationContent?) -> Void) {

        // Set sound name based on the value provided in action of MXPushRule
        for ruleAction in pushRule?.actions ?? [] {
            guard let action = ruleAction as? MXPushRuleAction else { continue }
            guard action.actionType == MXPushRuleActionTypeSetTweak else { continue }
            guard action.parameters["set_tweak"] as? String == "sound" else { continue }
            soundName = action.parameters["value"] as? String
            if soundName == "default" {
                soundName = "message.caf"
            }
        }
        
