diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
index cbe0f0fe..93da67f7 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
@@ -788,6 +788,9 @@ view2 texts flags extraClasses settings model =
 
         tabActive t =
             ( tabLook t, ToggleAkkordionTab t.name )
+
+        isNew =
+            model.settings.id == ""
     in
     div
         [ class extraClasses
@@ -797,19 +800,24 @@ view2 texts flags extraClasses settings model =
             { start =
                 [ MB.PrimaryButton
                     { tagger = Submit
-                    , label = texts.basics.submit
-                    , title = texts.basics.submitThisForm
+                    , label = texts.save
+                    , title =
+                        if isNew then
+                            texts.saveNewTitle
+
+                        else
+                            texts.updateTitle
                     , icon = Just "fa fa-save"
                     }
                 , MB.SecondaryButton
                     { tagger = Cancel
-                    , label = texts.basics.cancel
+                    , label = texts.basics.back
                     , title = texts.basics.backToList
                     , icon = Just "fa fa-arrow-left"
                     }
                 ]
             , end =
-                if model.settings.id /= "" then
+                if not isNew then
                     [ startOnceBtn
                     , MB.DeleteButton
                         { tagger = RequestDelete
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
index 8a1c7e8f..b57543d1 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
@@ -72,6 +72,9 @@ type alias Texts =
     , invalidCalEvent : String
     , attachmentsOnlyLabel : String
     , attachmentsOnlyInfo : String
+    , save : String
+    , saveNewTitle : String
+    , updateTitle : String
     }
 
 
@@ -153,6 +156,9 @@ gb =
     , invalidCalEvent = "The calendar event is not valid."
     , attachmentsOnlyLabel = "Only import e-mail attachments"
     , attachmentsOnlyInfo = "Discards the e-mail body and only imports the attachments."
+    , save = "Save"
+    , saveNewTitle = "Save a new task"
+    , updateTitle = "Update the task"
     }
 
 
@@ -229,4 +235,7 @@ kann hier ein Wert für alle festgelegt werden. Bei 'Automatisch' wird auf den S
     , invalidCalEvent = "Das Kalenderereignis ist ungültig."
     , attachmentsOnlyLabel = "Nur Anhänge importieren"
     , attachmentsOnlyInfo = "Verwirft den E-Mail Text und importiert nur die Anhänge."
+    , save = "Speichern"
+    , saveNewTitle = "Einen neuen Auftrag speichern"
+    , updateTitle = "Den Auftrag aktualisieren"
     }