diff --git a/Mail/Views/New Message/ComposeMessageProgressView.swift b/Mail/Views/New Message/ComposeMessageProgressView.swift
index 29d318579..894fa34cd 100644
--- a/Mail/Views/New Message/ComposeMessageProgressView.swift	
+++ b/Mail/Views/New Message/ComposeMessageProgressView.swift	
@@ -25,7 +25,7 @@ struct ComposeMessageProgressView: View {
     var body: some View {
         ProgressView()
             .progressViewStyle(.circular)
-            .composeMessageToolbar {
+            .baseComposeMessageToolbar {
                 dismiss()
                 dismissModal()
             }
diff --git a/Mail/Views/New Message/ComposeMessageToolbarModifier.swift b/Mail/Views/New Message/ComposeMessageToolbarModifier.swift
index 6047e716b..3f26ca812 100644
--- a/Mail/Views/New Message/ComposeMessageToolbarModifier.swift	
+++ b/Mail/Views/New Message/ComposeMessageToolbarModifier.swift	
@@ -23,12 +23,12 @@ import MailResources
 import SwiftUI
 
 extension View {
-    func composeMessageToolbar(dismissHandler: @escaping () -> Void) -> some View {
-        modifier(ComposeMessageToolbarModifier(dismissHandler: dismissHandler))
+    func baseComposeMessageToolbar(dismissHandler: @escaping () -> Void) -> some View {
+        modifier(BaseComposeMessageToolbarModifier(dismissHandler: dismissHandler))
     }
 }
 
-struct ComposeMessageToolbarModifier: ViewModifier {
+struct BaseComposeMessageToolbarModifier: ViewModifier {
     @LazyInjectService private var platformDetector: PlatformDetectable
 
     let dismissHandler: () -> Void
diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift
index 440fb6cfa..d6cb7d38a 100644
--- a/Mail/Views/New Message/ComposeMessageView.swift	
+++ b/Mail/Views/New Message/ComposeMessageView.swift	
@@ -166,7 +166,7 @@ struct ComposeMessageView: View {
                 focusedField = .editor
             }
         }
-        .composeMessageToolbar(dismissHandler: didTouchDismiss)
+        .baseComposeMessageToolbar(dismissHandler: didTouchDismiss)
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
                 Button(action: didTouchSend) {