diff --git a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
index adb07a36..4e67acd6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
@@ -24,6 +24,7 @@ import org.cryptomator.domain.exception.vaultconfig.VaultKeyInvalidException
 import org.cryptomator.domain.exception.vaultconfig.VaultVersionMismatchException
 import org.cryptomator.presentation.R
 import org.cryptomator.presentation.ui.activity.view.View
+import org.cryptomator.presentation.util.ResourceHelper
 import java.util.ArrayList
 import java.util.Collections
 import javax.inject.Inject
@@ -52,8 +53,20 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
 		staticHandler(HashMismatchUpdateCheckException::class.java, R.string.error_hash_mismatch_update)
 		staticHandler(GeneralUpdateErrorException::class.java, R.string.error_general_update)
 		staticHandler(SSLHandshakePreAndroid5UpdateCheckException::class.java, R.string.error_general_update)
-		staticHandler(VaultVersionMismatchException::class.java, R.string.error_vault_version_mismatch)
-		staticHandler(VaultKeyInvalidException::class.java, R.string.error_vault_key_invalid)
+		staticHandler(
+			VaultVersionMismatchException::class.java, String.format(
+				ResourceHelper.getString(R.string.error_vault_version_mismatch),
+				ResourceHelper.getString(R.string.vault_cryptomator),
+				ResourceHelper.getString(R.string.masterkey_cryptomator)
+			)
+		)
+		staticHandler(
+			VaultKeyInvalidException::class.java, String.format(
+				ResourceHelper.getString(R.string.error_vault_key_invalid),
+				ResourceHelper.getString(R.string.vault_cryptomator),
+				ResourceHelper.getString(R.string.masterkey_cryptomator)
+			)
+		)
 		staticHandler(VaultConfigLoadException::class.java, R.string.error_vault_config_loading)
 		staticHandler(UnsupportedMasterkeyLocationException::class.java, R.string.error_masterkey_location_not_supported)
 		staticHandler(NoSuchBucketException::class.java, R.string.error_no_such_bucket)
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index ff945ca0..8a87b0b0 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -6,6 +6,8 @@
 	<!-- # app -->
 	<string name="app_name" translatable="false">Cryptomator</string>
 	<string name="download_subdirectory_name" translatable="false">@string/app_name</string>
+	<string name="vault_cryptomator" translatable="false">vault.cryptomator</string>
+	<string name="masterkey_cryptomator" translatable="false">masterkey.cryptomator</string>
 	<string name="share_with_label">Encrypt</string>
 
 	<!-- # error messages -->
@@ -22,7 +24,7 @@
 	<string name="error_cloud_already_exists">Cloud already exists.</string>
 	<string name="error_activity_not_found">Please download an app that can open this file.</string>
 	<string name="error_server_not_found">Server not found.</string>
-	<string name="error_device_policy_manager_not_found">Please open your devices settings and set the screen lock by hand</string>
+	<string name="error_device_policy_manager_not_found">Please open your device settings and set the screen lock by hand</string>
 	<string name="error_export_illegal_file_name">Export failed. Try to remove special characters from file names and export again.</string>
 	<string name="error_name_contains_invalid_characters">Can\'t contain special characters.</string>
 	<string name="error_names_contains_invalid_characters">File names can\'t contain special characters.</string>
@@ -30,11 +32,11 @@
 	<string name="error_general_update">Update check failed. General error occurred.</string>
 	<string name="error_hash_mismatch_update">Update check failed. Calculated hash doesn\'t match the uploaded file</string>
 	<string name="error_update_no_internet">Update check failed. No internet connection.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Failed to decrypt WebDAV password, please re add in settings</string>
-	<string name="error_play_services_not_available">Play Services not installed</string>
+	<string name="error_failed_to_decrypt_webdav_password">Failed to decrypt WebDAV password, please re-add in settings</string>
+	<string name="error_play_services_not_available">Google Play Services not installed</string>
 	<string name="error_biometric_auth_aborted">Biometric authentication aborted</string>
-	<string name="error_vault_version_mismatch">Version specified in vault.cryptomator is different to masterkey.cryptomator</string>
-	<string name="error_vault_key_invalid">vault.cryptomator does not match with this masterkey.cryptomator</string>
+	<string name="error_vault_version_mismatch">Version specified in %1$s is different to %2$s</string>
+	<string name="error_vault_key_invalid">%1$s does not match with this %2$s</string>
 	<string name="error_vault_config_loading">General error while loading the vault config</string>
 	<string name="error_file_not_found_after_opening_using_3party">Local file isn\'t present anymore after switching back to Cryptomator. Possible changes cannot be propagated back to the cloud.</string>
 	<string name="error_no_such_bucket">No such bucket</string>
@@ -315,7 +317,7 @@
 
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Vault %1$s not found</string>
-	<string name="dialog_vault_not_found_message">The vault has been renamed, moved or deleted. Remove this vault form the list and add it again to proceed. Remove now?</string>
+	<string name="dialog_vault_not_found_message">The vault has been renamed, moved or deleted. Remove this vault from the list and add it again to proceed. Remove now?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Remove</string>
 
 	<string name="dialog_existing_file_title">File already exists</string>