diff --git a/enzevalos_iphone/AppDelegate.swift b/enzevalos_iphone/AppDelegate.swift
index ab3833ff0a631aa0ad95ba38dce8da2286d4a5cc..a3858ace4900917c6c1812806f77568a7efa9bcf 100644
--- a/enzevalos_iphone/AppDelegate.swift
+++ b/enzevalos_iphone/AppDelegate.swift
@@ -60,7 +60,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         else {
             //self.onboardingDone()
             dispatch_async(dispatch_get_main_queue(),{
-                self.showMessage("Bitte schalte unter Einstellungen den Zugriff auf die Kontakte frei, wenn du möchtest, dass die App richtig funktioniert", completion: self.onboardingDone)
+                self.showMessage(NSLocalizedString("AccessNotGranted", comment: ""), completion: self.onboardingDone)
             });
         }
     }
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index e367ef3a3a949cf4d6e83147cc9fe38a59412b36..83935f6cdeb452c210a4532d4502c23827a84e38 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -38,8 +38,8 @@ class Onboarding {
     static var fail : () -> () = {Void in}
     static var work : () -> () = {Void in}
 
-    static var authenticationRows : [Int : String] = [MCOAuthType.SASLNone.rawValue : "Keine", MCOAuthType.SASLLogin.rawValue : "Login", MCOAuthType.SASLPlain.rawValue : "Normal, Password", MCOAuthType.SASLSRP.rawValue : "SRP", MCOAuthType.SASLCRAMMD5.rawValue : "CRAMMD5", MCOAuthType.SASLDIGESTMD5.rawValue : "DIGESTMD5", MCOAuthType.SASLNTLM.rawValue : "NTLM", MCOAuthType.SASLGSSAPI.rawValue : "GSSAPI", MCOAuthType.SASLKerberosV4.rawValue : "KerberosV4"]
-    static var transportRows : [Int : String] = [MCOConnectionType.Clear.rawValue : "Klartext", MCOConnectionType.StartTLS.rawValue : "StartTLS", MCOConnectionType.TLS.rawValue : "TLS"]
+    static var authenticationRows : [Int : String] = [MCOAuthType.SASLNone.rawValue : NSLocalizedString("None", comment: ""), MCOAuthType.SASLLogin.rawValue : "Login", MCOAuthType.SASLPlain.rawValue : NSLocalizedString("NormalPassword", comment: ""), MCOAuthType.SASLSRP.rawValue : "SRP", MCOAuthType.SASLCRAMMD5.rawValue : "CRAMMD5", MCOAuthType.SASLDIGESTMD5.rawValue : "DIGESTMD5", MCOAuthType.SASLNTLM.rawValue : "NTLM", MCOAuthType.SASLGSSAPI.rawValue : "GSSAPI", MCOAuthType.SASLKerberosV4.rawValue : "KerberosV4"]
+    static var transportRows : [Int : String] = [MCOConnectionType.Clear.rawValue : NSLocalizedString("Plaintext", comment: ""), MCOConnectionType.StartTLS.rawValue : "StartTLS", MCOConnectionType.TLS.rawValue : "TLS"]
     
     static func onboarding(callback: dispatch_block_t) -> UIViewController {
         
@@ -72,7 +72,7 @@ class Onboarding {
         background = snapshot!
         
         //Content
-        let page1 = OnboardingContentViewController.contentWithTitle("Hallo", body: "Schön, dass du dich für sichere Email interessierst!", image: nil, buttonText: "", action: nil)
+        let page1 = OnboardingContentViewController.contentWithTitle(NSLocalizedString("Hello", comment: "Welcome"), body: NSLocalizedString("InterestedInSecureMail", comment: "commendation to user for using secure mail"), image: nil, buttonText: nil, action: nil)
         mailaddress = UITextField.init()
         //text.textColor = UIColor.whiteColor()
         //text.tintColor = UIColor.whiteColor()
@@ -80,8 +80,8 @@ class Onboarding {
         mailaddress.keyboardType = UIKeyboardType.EmailAddress
         mailaddress.autocorrectionType = UITextAutocorrectionType.No
         mailaddress.frame = CGRect.init(x: 0, y: 0, width: 50, height: 30)
-        mailaddress.placeholder = "Adresse"
-        let page2 = OnboardingContentViewController.contentWithTitle(nil, body: "Bitte gib deine Emailadresse ein", videoURL: nil, inputView: mailaddress, buttonText: nil, actionBlock: nil)
+        mailaddress.placeholder = NSLocalizedString("Address", comment: "")
+        let page2 = OnboardingContentViewController.contentWithTitle(nil, body: NSLocalizedString("InsertMailAddress", comment: ""), videoURL: nil, inputView: mailaddress, buttonText: nil, actionBlock: nil)
         
         password = UITextField.init()
         //text.textColor = UIColor.whiteColor()
@@ -89,9 +89,9 @@ class Onboarding {
         password.borderStyle = UITextBorderStyle.RoundedRect
         password.secureTextEntry = true
         password.frame = CGRect.init(x: 0, y: 0, width: 50, height: 30)
-        password.placeholder = "Passwort"
-        let page3 = OnboardingContentViewController.contentWithTitle(nil, body: "Bitte gib\ndein Passwort ein", videoURL: nil, inputView: password, buttonText: nil, actionBlock: nil)
-        let page4 = OnboardingContentViewController.contentWithTitle("Alles richtig?", body: nil, videoURL: nil, inputView: nil, buttonText: "Weiter", actionBlock: callback)
+        password.placeholder = NSLocalizedString("Password", comment: "")
+        let page3 = OnboardingContentViewController.contentWithTitle(nil, body: NSLocalizedString("InsertPassword", comment: ""), videoURL: nil, inputView: password, buttonText: nil, actionBlock: nil)
+        let page4 = OnboardingContentViewController.contentWithTitle(NSLocalizedString("EverythingCorrect", comment: ""), body: nil, videoURL: nil, inputView: nil, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
         
         
         return Onboard.OnboardingViewController(backgroundImage: background, contents: [page1, page2, page3, page4])
@@ -104,7 +104,7 @@ class Onboarding {
         let view = UIView.init()
         view.addSubview(activity)
         view.frame = activity.frame
-        let page1 = OnboardingContentViewController.contentWithTitle("Verbinde zum Mailserver", body: nil, videoURL: nil, inputView: view, buttonText: nil, actionBlock: nil)
+        let page1 = OnboardingContentViewController.contentWithTitle(NSLocalizedString("ConnectingToMailServer", comment: ""), body: nil, videoURL: nil, inputView: view, buttonText: nil, actionBlock: nil)
         
         return Onboard.OnboardingViewController(backgroundImage: background, contents: [page1])
     }
@@ -115,17 +115,17 @@ class Onboarding {
         let view = UIView.init()
         view.addSubview(activity)
         view.frame = activity.frame
-        let page1 = OnboardingContentViewController.contentWithTitle("Erstelle und verwalte Schlüssel", body: nil, videoURL: nil, inputView: view, buttonText: nil, actionBlock: nil)
+        let page1 = OnboardingContentViewController.contentWithTitle(NSLocalizedString("CreateAndManageKeys", comment: ""), body: nil, videoURL: nil, inputView: view, buttonText: nil, actionBlock: nil)
         
         return Onboard.OnboardingViewController(backgroundImage: background, contents: [page1])
     }
     
     static func detailOnboarding(callback: dispatch_block_t) -> UIViewController {
         
-        let start = OnboardingContentViewController.contentWithTitle("Schade!", body: "Die Verbindung zum Server konnte nicht hergestellt werden. Bitte überprüfe die folgenden Angaben und passe sie ggf. an.", videoURL: nil, inputView: nil, buttonText: nil, actionBlock: nil)
+        let start = OnboardingContentViewController.contentWithTitle(NSLocalizedString("WhatAShame", comment: ""), body: NSLocalizedString("CouldNotConnect", comment: ""), videoURL: nil, inputView: nil, buttonText: nil, actionBlock: nil)
         
         
-        let email = OnboardingContentViewController.contentWithTitle(nil, body: "Bitte gib deine Emailadresse ein", videoURL: nil, inputView: mailaddress, buttonText: nil, actionBlock: nil)
+        let email = OnboardingContentViewController.contentWithTitle(nil, body: NSLocalizedString("InsertMailAddress", comment: ""), videoURL: nil, inputView: mailaddress, buttonText: nil, actionBlock: nil)
         
         username = UITextField.init()
         //text.textColor = UIColor.whiteColor()
@@ -134,12 +134,12 @@ class Onboarding {
         username.keyboardType = UIKeyboardType.EmailAddress
         username.autocorrectionType = UITextAutocorrectionType.No
         username.frame = CGRect.init(x: 0, y: 0, width: 50, height: 30)
-        username.placeholder = "Nutzername"
+        username.placeholder = NSLocalizedString("Username", comment: "")
         username.text = UserManager.loadUserValue(Attribute.UserName) as? String
         
-        let user = OnboardingContentViewController.contentWithTitle(nil, body: "Bitte gib deinen Nutzernamen ein", videoURL: nil, inputView: username, buttonText: nil, actionBlock: nil)
+        let user = OnboardingContentViewController.contentWithTitle(nil, body: NSLocalizedString("InsertUsername", comment: ""), videoURL: nil, inputView: username, buttonText: nil, actionBlock: nil)
         
-        let passwd = OnboardingContentViewController.contentWithTitle(nil, body: "Bitte gib\ndein Passwort ein", videoURL: nil, inputView: password, buttonText: nil, actionBlock: nil)
+        let passwd = OnboardingContentViewController.contentWithTitle(nil, body: NSLocalizedString("InsertPassword", comment: ""), videoURL: nil, inputView: password, buttonText: nil, actionBlock: nil)
         
         imapServer.borderStyle = UITextBorderStyle.RoundedRect
         imapServer.frame = CGRect.init(x: 0, y: 0, width: 50, height: 30)
@@ -183,7 +183,7 @@ class Onboarding {
         //}
         
         let imapAuthLabel = UILabel.init()
-        imapAuthLabel.text = "IMAP-Authentifizierung"
+        imapAuthLabel.text = "IMAP-"+NSLocalizedString("Authentification", comment: "")
         
         imapAuthLabel.textColor = UIColor.whiteColor();
         imapAuthLabel.font = font
@@ -213,7 +213,7 @@ class Onboarding {
         imapAuth.addSubview(imapAuthentication)
         let boolPointer = UnsafeMutablePointer<ObjCBool>.alloc(1)
         boolPointer[0] = false
-        let imap2 = OnboardingContentViewController.contentWithTitle(nil, body: "IMAP-Transferverschlüsselung", videoURL: nil, inputView: imapAuth, buttonText: nil, actionBlock: nil, withPadding: boolPointer)
+        let imap2 = OnboardingContentViewController.contentWithTitle(nil, body: "IMAP-"+NSLocalizedString("Transportencryption", comment: ""), videoURL: nil, inputView: imapAuth, buttonText: nil, actionBlock: nil, withPadding: boolPointer)
         
         
         smtpServer.borderStyle = UITextBorderStyle.RoundedRect
@@ -258,7 +258,7 @@ class Onboarding {
         //}
         
         let smtpAuthLabel = UILabel.init()
-        smtpAuthLabel.text = "SMTP-Authentifizierung"
+        smtpAuthLabel.text = "SMTP-"+NSLocalizedString("Authentification", comment: "")
         
         smtpAuthLabel.textColor = UIColor.whiteColor();
         smtpAuthLabel.font = font
@@ -287,10 +287,10 @@ class Onboarding {
         smtpAuth.addSubview(smtpAuthLabel)
         smtpAuth.addSubview(smtpAuthentication)
         boolPointer[0] = false
-        let smtp2 = OnboardingContentViewController.contentWithTitle(nil, body: "SMTP-Transferverschlüsselung", videoURL: nil, inputView: smtpAuth, buttonText: nil, actionBlock: nil, withPadding: boolPointer)
+        let smtp2 = OnboardingContentViewController.contentWithTitle(nil, body: "SMTP-"+NSLocalizedString("Transportencryption", comment: ""), videoURL: nil, inputView: smtpAuth, buttonText: nil, actionBlock: nil, withPadding: boolPointer)
 
         
-        let last = OnboardingContentViewController.contentWithTitle("Alles richtig?", body: nil, videoURL: nil, inputView: nil, buttonText: "Weiter", actionBlock: callback)
+        let last = OnboardingContentViewController.contentWithTitle(NSLocalizedString("EverythingCorrect", comment: ""), body: nil, videoURL: nil, inputView: nil, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
         
         return Onboard.OnboardingViewController(backgroundImage: background, contents: [start, email, user, passwd, imap1, imap2, smtp1, smtp2, last])
     }
@@ -301,7 +301,7 @@ class Onboarding {
         let view = UIView.init()
         view.addSubview(activity)
         view.frame = activity.frame
-        let page1 = OnboardingContentViewController.contentWithTitle("Zugriff auf Kontakte", body: "Damit diese App richtig funktioniert, brauchen wir Zugriff auf deine Kontakte. Wir teilen diese Daten mit niemandem und senden sie auch nicht über das Internet.", videoURL: nil, inputView: nil, buttonText: "weiter", actionBlock: callback)
+        let page1 = OnboardingContentViewController.contentWithTitle(NSLocalizedString("AccessContacts", comment: ""), body: NSLocalizedString("AccessContactsDescription", comment: "Description, why we need access"), videoURL: nil, inputView: nil, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
         
         return Onboard.OnboardingViewController(backgroundImage: background, contents: [page1])
     }
diff --git a/enzevalos_iphone/de.lproj/Localizable.strings b/enzevalos_iphone/de.lproj/Localizable.strings
index fe36c562a936e6027c162f6403ceb8b354cdfa04..2e19691ba9bcb9e0d67a41d6871aec200562e2b3 100644
--- a/enzevalos_iphone/de.lproj/Localizable.strings
+++ b/enzevalos_iphone/de.lproj/Localizable.strings
@@ -5,27 +5,40 @@
   Created by jakobsbode on 06.10.16.
   Copyright © 2016 fu-berlin. All rights reserved.
 */
+"AccessContacts" = "Zugriff auf Kontakte";
+"AccessContactsDescription" = "Damit diese App richtig funktioniert, brauchen wir Zugriff auf deine Kontakte. Wir teilen diese Daten mit niemandem und senden sie auch nicht über das Internet.";
+"AccessNotGranted" = "Bitte schalte unter Einstellungen den Zugriff auf die Kontakte frei, wenn du möchtest, dass die App richtig funktioniert";
 "Address" = "Adresse";
 "Addressbook" = "Adressbuch";
 "Attach" = "Anhängen";
 "Attachment" = "Anhang";
+"Authentification" = "Authentifizierung";
 "Back" = "Zurück";
 "Bcc" = "Blindkopie";
 "Cancel" = "Abbrechen";
 "Cc" = "Kopie";
+"CouldNotConnect" = "Die Verbindung zum Server konnte nicht hergestellt werden. Bitte überprüfe die folgenden Angaben und passe sie ggf. an.";
+"ConnectingToMailserver" = "Verbinde zum Mailserver";
 "Contacts" = "Kontakte";
 "Content" = "Inhalt";
 "ContentNo" = "Kein Inhalt";
+"CreateAndManageKeys" = "Erstelle und verwalte Schlüssel";
 "Details" = "Key Details";
 "DiscoveryTime" = "Entdeckungszeit";
 "Checkmarks" = "Du hast Nachrichten von den Adressen mit Haken bekommen";
 "Drafts" = "Entwürfe";
 "Emailaddress" = "Emailadresse";
 "EncryptionType" = "Verschlüsselungsart";
+"EverythingCorrect" = "Alles richtig?";
 "Forward" = "Weiterleiten";
 "From" = "Von";
+"Hello" = "Hallo";
 "Inbox" = "Postfach";//Briefkasten?
 "Insecure" = "Unsicher";
+"InsertMailAddress" = "Bitte gib deine Emailadresse ein";
+"InsertPassword" = "Bitte gib\ndein Passwort ein";
+"InsertUSername" = "Bitte gib deinen Nutzernamen ein";
+"InterestedInSecureMail" = "Schön, dass du dich für sichere Email interessierst!";
 "Junk" = "Spam";
 "KeyAddresses" = "Mailadressen im Schlüssel";
 "KeyDetails" = "Key Details";
@@ -39,9 +52,14 @@
 "mail from" = "Nachricht von";
 "Message" = "Nachricht";
 "MoreInformation" = "Mehr Informationen";
+"next" = "weiter";
+"None" = "Keine";
+"NormalPassword" = "Normal, Passwort";
 "Now" = "jetzt";
 "OneMinuteAgo" = "vor 1 min";
 "original message" = "originale Nachricht";
+"Password" = "Passwort";
+"Plaintext" = "Klartext";
 "Postcard" = "Postkarte";
 "Re" = "AW";
 "Receive" = "Empfangen";
@@ -70,8 +88,11 @@
 "SubjectNo" = "Kein Betreff";
 "To" = "An";
 "to" = "an";
+"Transportencryption" = "Transferverschlüsselung";
 "Trash" = "Papierkorb";
 "TwoDaysAgo" = "Vorgestern";
+"Username" = "Nutzername";
+"WhatAShame" = "Schade!";
 "write" = "verfassen";
 "Yesterday" = "Gestern";
 "NoFurtherMessages" = "Keine weiteren Nachrichten...";
diff --git a/enzevalos_iphone/en.lproj/Localizable.strings b/enzevalos_iphone/en.lproj/Localizable.strings
index 8b00c11fc59efd65468535d230f47f581358ae72..a05adeb056244fb47e6381f0ad0afa383bc20d60 100644
--- a/enzevalos_iphone/en.lproj/Localizable.strings
+++ b/enzevalos_iphone/en.lproj/Localizable.strings
@@ -5,27 +5,40 @@
   Created by jakobsbode on 06.10.16.
   Copyright © 2016 fu-berlin. All rights reserved.
 */
+"AccessContacts" = "Access contacts";
+"AccessContactsDescription" = "This App requires access to your contacts to work properly. We do not share your data with others or transfer it over the internet.";
+"AccessNotGranted" = "Please allow access to contacts in Settings, to get to know the true promise of this App";
 "Address" = "Address";
 "Addressbook" = "Addressbook";
 "Attach" = "Attach";
 "Attachment" = "Attachment";
+"Authentification" = "Authentification";
 "Back" = "Back";
 "Bcc" = "Bcc";//"Blindkopie";
 "Cancel" = "Cancel";
 "Cc" = "Cc";//"Kopie";
+"CouldNotConnect" = "Couldn't connect to server. Please check your data and modify it maybe.";
+"ConnectingToMailServer" = "Connecting to mailserver";
 "Contacts" = "Contacts";
 "Content" = "Content";
 "ContentNo" = "No content";
+"CreateAndManageKeys" = "Create and manage keys";
 "Details" = "Key Details";
 "Checkmarks" = "You received Mails from Mailadresses with checkmarks";
 "DiscoveryTime" = "Discoverytime";
 "Drafts" = "Drafts";
 "Emailaddress" = "Emailaddress";
 "EncryptionType" = "Encryption Type";
+"EverythingCorrect" = "Everything correct?";
 "Forward" = "Forward";
 "From" = "From";
+"Hello" = "Hello";
 "Inbox" = "Inbox";
 "Insecure" = "Insecure";
+"InsertMailAddress" = "Please insert your mailaddress";
+"InsertPassword" = "Please insert your password";
+"InsertUsername" = "Please insert your username";
+"InterestedInSecureMail" = "Nice to see you interested in secure mail!";
 "Junk" = "Junk";
 "KeyAddresses" = "Mailaddresses from the key";
 "KeyDetails" = "Key Details";
@@ -38,9 +51,14 @@
 "mail from" = "mail from";
 "Message" = "Message";
 "MoreInformation" = "More Information";
+"next" = "next";
+"None" = "None";
+"NormalPassword" = "Normal, password";
 "Now" = "just now";
 "OneMinuteAgo" = "1 min ago";
 "original message" = "original message";
+"Password" = "Password";
+"Plaintext" = "Plaintext";
 "Postcard" = "Postcard";
 "Re" = "Re";
 "Receive" = "Receive";
@@ -69,8 +87,11 @@
 "SubjectNo" = "No subject";
 "To" = "To";
 "to" = "to";
+"Transportencryption" = "Transportencryption";
 "Trash" = "Trash";
 "TwoDaysAgo" = "2 days ago";
+"Username" = "Username";
+"WhatAShame" = "What a shame!";
 "write" = "write";
 "Yesterday" = "yesterday";
 "NoFurtherMessages" = "No further messages...";