diff --git a/ENGAGEHF/Dashboard/Messages/MessageRow.swift b/ENGAGEHF/Dashboard/Messages/MessageRow.swift
index 1d95f9b6..64a462cd 100644
--- a/ENGAGEHF/Dashboard/Messages/MessageRow.swift
+++ b/ENGAGEHF/Dashboard/Messages/MessageRow.swift
@@ -69,12 +69,12 @@ struct MessageRow: View {
                 .font(.caption)
                 .foregroundStyle(.secondary)
         }
-        .padding(.vertical, 4)
-        .padding(.horizontal, 8)
-        .background {
-            Capsule()
-                .fill(.secondary.opacity(0.1))
-        }
+            .padding(.vertical, 4)
+            .padding(.horizontal, 8)
+            .background {
+                Capsule()
+                    .fill(.secondary.opacity(0.1))
+            }
     }
     
     private var processingStateText: String {
@@ -138,18 +138,18 @@ struct MessageRow: View {
                 .frame(width: 38)
             mainContent
         }
-        .padding(2)
-        .asButton {
-            if message.action != .unknown && !message.isProcessing {
-                Task {
-                    let didPerformAction = await navigationManager.execute(message.action)
-                    if message.isDismissible, didPerformAction {
-                        await messageManager.dismiss(message, didPerformAction: didPerformAction)
+            .padding(2)
+            .asButton {
+                if message.action != .unknown && !message.isProcessing {
+                    Task {
+                        let didPerformAction = await navigationManager.execute(message.action)
+                        if message.isDismissible, didPerformAction {
+                            await messageManager.dismiss(message, didPerformAction: didPerformAction)
+                        }
                     }
                 }
             }
-        }
-        .disabled(message.isProcessing)
+            .disabled(message.isProcessing)
     }
 }
 
diff --git a/ENGAGEHF/Managers/MessageManager/Message.swift b/ENGAGEHF/Managers/MessageManager/Message.swift
index e2431ae2..5766bb70 100644
--- a/ENGAGEHF/Managers/MessageManager/Message.swift
+++ b/ENGAGEHF/Managers/MessageManager/Message.swift
@@ -26,10 +26,7 @@ struct Message: Identifiable, Equatable {
     var processingState: ProcessingState?
     
     var isProcessing: Bool {
-        guard let processingState else {
-            return false
-        }
-        return processingState.isStillProcessing
+        processingState.isStillProcessing ?? false
     }
     
     func isRelatedTo(_ state: ProcessingState) -> Bool {
diff --git a/ENGAGEHF/Managers/MessageManager/ProcessingState.swift b/ENGAGEHF/Managers/MessageManager/ProcessingState.swift
index ee4711cc..62c7e282 100644
--- a/ENGAGEHF/Managers/MessageManager/ProcessingState.swift
+++ b/ENGAGEHF/Managers/MessageManager/ProcessingState.swift
@@ -28,6 +28,6 @@ struct ProcessingState: Equatable {
     let correlationId: String
     
     var isStillProcessing: Bool {
-        Date().timeIntervalSince(startTime) < 60
+        .now.timeIntervalSince(startTime) < 60
     }
 }