diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/alerts/AskDeleteAccountAlert.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/alerts/AskDeleteAccountAlert.kt
index 3c953a80..61665151 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/alerts/AskDeleteAccountAlert.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/alerts/AskDeleteAccountAlert.kt
@@ -11,8 +11,8 @@ open class AskDeleteAccountAlert {
 
     open fun show(bank: TypedBankData, presenter: BankingPresenter, context: Context, accountDeleted: (() -> Unit)? = null) {
         AlertDialog.Builder(context)
-            .setTitle(context.getString(R.string.alert_ask_delete_account_title, bank.displayName))
-            .setMessage(context.getString(R.string.alert_ask_delete_account_message))
+            .setTitle(context.getString(R.string.alert_ask_delete_account_title))
+            .setMessage(context.getString(R.string.alert_ask_delete_account_message, bank.displayName))
             .setPositiveButton(R.string.delete) { dialog, _ ->
                 presenter.deleteAccount(bank)
                 dialog.dismiss()
diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
index fed53f69..9c920102 100644
--- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
@@ -47,10 +47,10 @@
     <string name="other">Sonstige</string>
 
 
-    <string name="activity_login_authenticate_with_password_prompt">Geben Sie Ihr Passwort ein</string>
+    <string name="activity_login_authenticate_with_password_prompt">Um die App zu entsperren geben Sie bitte Ihr Passwort ein</string>
     <string name="activity_login_authenticate_with_password_hint">Passwort eingeben</string>
+    <string name="activity_login_authenticate_with_biometrics_prompt">Um die App zu entsperren authentifizieren Sie sich bitte per Fingerabdruck oder Gesichtserkennung</string>
     <string name="activity_login_login_button_title">Anmelden</string>
-    <string name="activity_login_authenticate_with_biometrics_prompt">Authentifizieren Sie sich per Fingerabdruck oder Gesichtserkennung</string>
     <string name="activity_login_incorrect_password_entered">Falsches Passwort eingegeben</string>
 
 
@@ -88,7 +88,7 @@
 
     <string name="dialog_add_account_enter_bank">Bank (Suche auch mittels Bankleitzahl oder Ort):</string>
     <string name="dialog_add_account_add">Hinzufügen</string>
-    <string name="dialog_add_account_bank_does_not_support_fints_3_error_message">%s untersützt FinTS 3.0 nicht und kann deshalb mit dieser App nicht verwendet werden.</string>
+    <string name="dialog_add_account_bank_does_not_support_fints_3_error_message">%s untersützt FinTS 3.0 nicht und kann deshalb leider mit dieser App nicht verwendet werden.</string>
     <string name="dialog_add_account_message_could_not_add_account">Konto konnte nicht hinzugefügt werden.\n\nFehlermeldung Ihrer Bank:\n\n%s</string>
 
     <string name="dialog_transfer_money_account">Konto:</string>
@@ -107,7 +107,7 @@
     <string name="dialog_transfer_money_message_transfer_successful">%1$s %2$s wurden erfolgreich an %3$s überwiesen.</string>
     <string name="dialog_transfer_money_message_transfer_failed">Konnte nicht %1$s %2$s an %3$s überweisen.\n\nFehlermeldung Ihrer Bank:\n\n%4$s</string>
 
-    <string name="transfer_money_from_pdf_error_message_not_a_searchable_pdf">Konnte Text nicht aus Datei "%1$s" extrahieren. Enthält sie auch Text oder nur Bilder?</string>
+    <string name="transfer_money_from_pdf_error_message_not_a_searchable_pdf">Konnte Text nicht aus Datei "%1$s" extrahieren. Enthält die Datei auch Text oder nur Bilder?</string>
     <string name="transfer_money_from_pdf_error_message_could_not_extract_text">Text konnte nicht aus Datei "%1$s" extrahiert werden:\n\n%2$s</string>
     <string name="transfer_money_from_pdf_error_message_could_not_extract_invoice_data">Überweisungsdaten konnten aus der Datei "%1$s" nicht ausgelesen werden:\n\n%2$s</string>
 
@@ -177,12 +177,11 @@
     <string name="share_account_data_account_number">Kontonumber %S</string>
 
 
-    <string name="alert_ask_discard_changes_title">Nicht gespeicherte Änderungen</string>
-    <string name="alert_ask_discard_changes_message">Es wurden nicht alle Änderungen gespeichert. Sind Sie sich sicher, dass Sie sie verwerfen möchten?\n\n(TODO: Oder einfach: Änderungen verwerfen?)</string>
+    <string name="alert_ask_discard_changes_title">Änderungen verwerfen?</string>
+    <string name="alert_ask_discard_changes_message">Ihre Änderungen wurden nicht gespeichert. Sind Sie sich sicher, dass Sie sie verwerfen möchten?</string>
 
-    <string name="alert_ask_delete_account_title">Konto \'%s\' wirklich löschen?</string>
-    <string name="alert_ask_delete_account_message">Alle Daten zu diesem Konto werden lokal vollständig gelöscht.
-        \n\nZum Wiederherstellen müssen sie, falls dann noch möglich, erneut vom Bankserver abgeholt werden.</string>
+    <string name="alert_ask_delete_account_title">Konto löschen?</string>
+    <string name="alert_ask_delete_account_message">Möchten Sie das Konto \'%s\' aus der App entfernen? Sämtliche lokal gespeicherten Kontodaten werden hierbei gelöscht.</string>
 
 
     <string name="error_no_name_entered">Bitte geben Sie den Namen des Empfängers ein</string>
diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml
index 749b5563..499a9e0b 100644
--- a/ui/BankingAndroidApp/src/main/res/values/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml
@@ -47,10 +47,10 @@
     <string name="other">Other</string>
 
 
-    <string name="activity_login_authenticate_with_password_prompt">Please enter your password</string>
+    <string name="activity_login_authenticate_with_password_prompt">To unlock app please enter your password</string>
     <string name="activity_login_authenticate_with_password_hint">Enter your password</string>
+    <string name="activity_login_authenticate_with_biometrics_prompt">To unlock app please authenticate with fingerprint or face recognition</string>
     <string name="activity_login_login_button_title">Login</string>
-    <string name="activity_login_authenticate_with_biometrics_prompt">Authenticate with fingerprint or face recognition</string>
     <string name="activity_login_incorrect_password_entered">Incorrect password entered</string>
 
 
@@ -88,7 +88,7 @@
 
     <string name="dialog_add_account_enter_bank">Bank (find also by bank code or city):</string>
     <string name="dialog_add_account_add">Add</string>
-    <string name="dialog_add_account_bank_does_not_support_fints_3_error_message">%s does not support FinTS 3.0 and therefore cannot be used in this application.</string>
+    <string name="dialog_add_account_bank_does_not_support_fints_3_error_message">%s does not support FinTS 3.0 and can therefore unfortunately not be used with this app.</string>
     <string name="dialog_add_account_message_could_not_add_account">Could not add account.\n\nError message from your bank:\n\n%s</string>
 
     <string name="dialog_transfer_money_account">Account:</string>
@@ -177,12 +177,11 @@
     <string name="share_account_data_account_number">Account number %S</string>
 
 
-    <string name="alert_ask_discard_changes_title">Unsaved changed</string>
-    <string name="alert_ask_discard_changes_message">Changed data hasn\'t been saved. Are you sure you want to discard them?\n\n(TODO: Oder einfach: Discard changes?)</string>
+    <string name="alert_ask_discard_changes_title">Discard changes?</string>
+    <string name="alert_ask_discard_changes_message">Your changes have not been saved. Are you sure you want to discard them?</string>
 
-    <string name="alert_ask_delete_account_title">Really delete account \'%s\'?</string>
-    <string name="alert_ask_delete_account_message">All data for this account will locally be permanently deleted.
-        \n\nThey can only be restored, if then still possible, by retrieving it again from your bank server.</string>
+    <string name="alert_ask_delete_account_title">Delete account?</string>
+    <string name="alert_ask_delete_account_message">Would you like to remove account \'%s\' from app? All locally stored account data will be deleted.</string>
 
 
     <string name="error_no_name_entered">Please enter recipient\'s name</string>
diff --git a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
index 37799b09..784354b6 100644
--- a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
+++ b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
@@ -46,11 +46,12 @@
 /*      LoginDialog        */
 
 "Login Dialog title" = "Login";
+"To unlock app please enter your password" = "To unlock app please enter your password";
+"Enter your password" = "Enter your password";
 "Authenticate to change app protection settings" = "Authenticate to change app protection settings";
-"Authenticate with biometrics to unlock app reason" = "Authenticate to unlock your data";
 "To unlock app please authenticate with FaceID" = "To unlock app please authenticate with FaceID";
 "To unlock app please authenticate with TouchID" = "To unlock app please authenticate with TouchID";
-"Enter your password" = "Enter your password";
+"Authenticate with biometrics to unlock app reason" = "Authenticate to unlock your data";
 "Login" = "Login";
 "Authentication failed" = "Authentication failed";
 "Incorrect password entered" = "Incorrect password entered";
@@ -66,7 +67,7 @@
 "Unsupported banks" = "Unsupported banks";
 
 "%@ does not support FinTS 3.0" = "%@ does not support FinTS 3.0";
-"Only banks supporting FinTS 3.0 can be used in this app." = "In this app only banks supporting the German banking standard FinTS 3.0 can be used.";
+"%@ does not support FinTS 3.0." = "In this app only banks supporting the German online banking standard FinTS 3.0 can be used.";
 
 
 /*      AddAccountDialog        */
@@ -191,11 +192,11 @@ Unfortunately, Bankmeister cannot know whether a bank charges for real-time tran
 
 "Delete account" = "Delete account";
 
-"Unsaved changes" = "Unsaved changes";
-"Changed data hasn't been saved. Are you sure you want to discard them?" = "Changed data hasn't been saved. Are you sure you want to discard them?";
+"Discard changes?" = "Discard changes?";
+"Your changes have not been saved. Are you sure you want to discard them?" = "Your changes have not been saved. Are you sure you want to discard them?";
 
-"Really delete account '%@'?" = "Really delete account '%@'?";
-"All data for this account will be permanently deleted locally." = "All data for this account will locally be permanently deleted.\n\nThey can only be restored, if then still possible, by retrieving it again from your bank server.";
+"Delete account?" = "Delete account?";
+"Would you like to remove account '%@' from app?" = "Would you like to remove account '%@' from app? All locally stored account data will be deleted.";
 
 
 /*      BankAccountSettingsDialog       */
diff --git a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings
index efab41ac..53193d1c 100644
--- a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings
+++ b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings
@@ -46,11 +46,12 @@
 /*      LoginDialog        */
 
 "Login Dialog title" = "Anmelden";
-"Authenticate to change app protection settings" = "Authentifizieren Sie sich um die Einstellungen zum Schutz der Appdaten zu ändern";
-"Authenticate with biometrics to unlock app reason" = "Authentifizieren Sie sich bitte um ihre Daten zu entsperren";
+"To unlock app please enter your password" = "Um die App zu entsperren geben Sie bitte Ihr Passwort ein";
+"Enter your password" = "Geben Sie Ihr Passwort ein";
 "To unlock app please authenticate with FaceID" = "Authentifizieren Sich sich bitte mit FaceID um die App zu entsperren";
 "To unlock app please authenticate with TouchID" = "Authentifizieren Sich sich bitte mit TouchID um die App zu entsperren";
-"Enter your password" = "Geben Sie Ihr Passwort ein";
+"Authenticate with biometrics to unlock app reason" = "Authentifizieren Sie sich bitte um ihre Daten zu entsperren";
+"Authenticate to change app protection settings" = "Authentifizieren Sie sich um die Einstellungen zum Schutz der Appdaten zu ändern";
 "Login" = "Anmelden";
 "Authentication failed" = "Authentifizierung fehlgeschlagen";
 "Incorrect password entered" = "Falsches Passwort eingegeben";
@@ -65,8 +66,8 @@
 "No supported banks found" = "Keine unterstützten Banken gefunden";
 "Unsupported banks" = "Nicht unterstützte Banken";
 
-"%@ does not support FinTS 3.0" = "%@ wird von App nicht unterstützt";
-"Only banks supporting FinTS 3.0 can be used in this app." = "In dieser App können nur Banken verwendet werden, die den deutschen Online-Banking Standard FinTS 3.0 unterstützen.";
+"%@ does not support FinTS 3.0" = "Hinzufügen von %@ nicht möglich";
+"%@ does not support FinTS 3.0." = "In dieser App können nur Banken verwendet werden, die den deutschen Online-Banking Standard FinTS 3.0 unterstützen. %@ unterstützt diesen Standard nicht.";
 
 
 /*      AddAccountDialog        */
@@ -192,11 +193,11 @@ Ob eine Bank Gebühren für Echtzeitüberweisungen erhebt, kann Bankmeister leid
 
 "Delete account" = "Konto löschen";
 
-"Unsaved changes" = "Nicht gespeicherte Änderungen";
-"Changed data hasn't been saved. Are you sure you want to discard them?" = "Es wurden nicht alle Änderungen gespeichert. Sind Sie sich sicher, dass Sie sie verwerfen möchten?";
+"Discard changes?" = "Änderungen verwerfen?";
+"Your changes have not been saved. Are you sure you want to discard them?" = "Ihre Änderungen wurden nicht gespeichert. Sind Sie sich sicher, dass Sie sie verwerfen möchten?";
 
-"Really delete account '%@'?" = "Konto '%@' wirklich löschen?";
-"All data for this account will be permanently deleted locally." = "Alle Daten zu diesem Konto werden lokal vollständig gelöscht.\n\nZum Wiederherstellen müssen sie, falls dann noch möglich, erneut vom Bankserver abgeholt werden.";
+"Delete account?" = "Konto löschen?";
+"Would you like to remove account '%@' from app?" = "Möchten Sie das Konto \'%@\' aus der App entfernen? Sämtliche lokal gespeicherten Kontodaten werden hierbei gelöscht.";
 
 
 /*      BankAccountSettingsDialog       */
diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/Messages.swift b/ui/BankingiOSApp/BankingiOSApp/ui/Messages.swift
index 117f79fa..4563e298 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/Messages.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/Messages.swift
@@ -5,15 +5,15 @@ import BankingUiSwift
 extension Message {
     
     static func createUnsavedChangesMessage(_ discardChanges: @escaping () -> Void) -> Message {
-        return Message(title: Text("Unsaved changes"),
-                       message: Text("Changed data hasn't been saved. Are you sure you want to discard them?"),
+        return Message(title: Text("Discard changes?"),
+                       message: Text("Your changes have not been saved. Are you sure you want to discard them?"),
                        primaryButton: .discard(discardChanges),
                        secondaryButton: .cancel())
     }
     
     static func createAskUserToDeleteAccountMessage(_ bank: IBankData, _ deleteAccount: @escaping (IBankData) -> Void) -> Message {
-        return Message(title: Text("Really delete account '\(bank.displayName)'?"),
-                       message: Text("All data for this account will be permanently deleted locally."),
+        return Message(title: Text("Delete account?"),
+                       message: Text("Would you like to remove account '\(bank.displayName)' from app?"),
                        primaryButton: .destructive(Text("Delete"), action: { deleteAccount(bank) } ),
                        secondaryButton: .cancel())
     }
diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/LoginDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/LoginDialog.swift
index db8d0fc5..6002c203 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/LoginDialog.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/LoginDialog.swift
@@ -66,12 +66,10 @@ struct LoginDialog: View {
                 }
             }
             else {
-                loginReason.map { loginReason in
-                    Text(loginReason)
-                        .multilineTextAlignment(.center)
-                        .padding()
-                        .padding(.bottom, 0)
-                }
+                Text(loginReason ?? "To unlock app please enter your password")
+                    .multilineTextAlignment(.center)
+                    .padding()
+                    .padding(.bottom, 0)
                 
                 Form {
                     Section {
diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/views/listitems/BankListItem.swift b/ui/BankingiOSApp/BankingiOSApp/ui/views/listitems/BankListItem.swift
index 13f836f9..34edce34 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/views/listitems/BankListItem.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/views/listitems/BankListItem.swift
@@ -61,11 +61,10 @@ struct BankListItem : View {
     }
 
     private func askUserToDeleteAccount() {
-        // couldn't believe it, .alert() didn't work as SwiftUI resetted @State variable to dislpay it instantly, therefore Alert never got displayed
-        // TODO: use values from Message.createAskUserToDeleteAccountMessage(self.bank, self.deleteAccount)
+        // couldn't believe it, .alert() didn't work as SwiftUI reset @State variable to display it instantly, therefore Alert never got displayed
         UIAlert(
-            "Really delete account '%@'?".localize(bank.displayName),
-            "All data for this account will be permanently deleted locally.",
+            "Delete account?".localize(),
+            "Would you like to remove account '%@' from app?".localize(bank.displayName),
             UIAlertAction.destructive("Delete") { self.deleteAccount(self.bank) },
             UIAlertAction.cancel()
         ).show()