diff --git a/src/translation/en.json b/src/translation/en.json
index b11c20e93..41df740b2 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -29,7 +29,61 @@
         }
     },
     "appstore": {
-        "title": "App Store"
+        "title": "App Store",
+        "category": {
+            "all": "All",
+            "popular": "Popular",
+            "newApps": "New Apps"
+        },
+        "searchPlaceholder": "Search for alternatives like Github, Dropbox, Slack, Trello, ...",
+        "noAppsFound": "No apps found.",
+        "appMissing": "Missing an app? Let us know.",
+        "unstable": "Unstable",
+        "installDialog": {
+            "lastUpdated": "Last updated {{ date }}",
+            "memoryRequirement": "Requires at least {{ size }} memory",
+            "location": "Location",
+            "locationPlaceholder": "Leave empty to use bare domain",
+            "linodeWarning": "Linode DNS average <a target=\"_blank\" href=\"{{ linodeDocsLink }}\">propagation time</a> is 30 minutes. Installing the app will take a while.",
+            "manualWarning": "Add an A record manually for <b>{{ location }}</b> to this Cloudron's public IP",
+            "userManagement": "User management",
+            "userManagementNone": "This app has it's own user management.",
+            "userManagementMailbox": "All users with a mailbox on this Cloudron have access.",
+            "userManagementLeaveToApp": "Leave user management to the app",
+            "userManagementAllUsers": "Allow all users from this Cloudron",
+            "userManagementSelectUsers": "Only allow the following users and groups",
+            "errorUserManagementSelectAtLeastOne": "Select at least one user or group",
+            "users": "Users",
+            "groups": "Groups",
+            "configuredForCloudronEmail": "This app is pre-configured for use with <a href=\"{{ emailDocsLink }}\" target=\"_blank\">Cloudron Email</a>.",
+            "lowOnResources": "This Cloudron is running low on resources.",
+            "pleaseUpgradeServer": "Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.",
+            "subscriptionRequired": "To install more apps, a paid subscription is required.",
+            "setupSubscriptionAction": "Setup Subscription",
+            "installAnywayAction": "Install anyway",
+            "installAction": "Install",
+            "doInstallAction": "Install {{ dnsOverwrite ? 'and overwrite DNS' : '' }}"
+        },
+        "appNotFoundDialog": {
+            "title": "App not found",
+            "description": "There is no such app <b>{{ appId }}</b> with version <b>{{ version }}</b>."
+        },
+        "accountDialog": {
+            "titleSignUp": "Sign up with Cloudron.io",
+            "titleLogin": "Login to Cloudron.io",
+            "description": "This account is used to access the App Store and manage your subscription",
+            "email": "Email",
+            "password": "Password",
+            "2faToken": "2FA Token (if enabled)",
+            "intendedUse": "Intended Use",
+            "chooseAnOption": "Please choose an option...",
+            "licenseCheckbox": "I accept the Cloudron <a href=\"{{ licenseLink }}\" target=\"_blank\">license</a>",
+            "errorWrongPassword": "Wrong password",
+            "loginAction": "Login",
+            "createAccountAction": "Create Account",
+            "switchToSignUpAction": "Don't have an account yet? Sign up",
+            "switchToLoginAction": "Already have an account? Log in"
+        }
     },
     "users": {
         "title": "Users",
@@ -935,6 +989,10 @@
             "title": "Delete mailing list {{ name }}@{{ domain }}",
             "description": "Really delete mailinglist <b>{{ name }}@{{ domain }}</b>?",
             "deleteAction": "Delete"
+        },
+        "mailboxboxDialog": {
+            "usersHeader": "Users",
+            "groupsHeader": "Groups"
         }
     },
     "incomingServerInfo": "Incoming Mail (IMAP)"
diff --git a/src/views/email.html b/src/views/email.html
index 14fd1e249..ec9f059c4 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -87,7 +87,7 @@
           <div class="form-group">
             <label class="control-label">{{ 'email.addMailboxDialog.owner' | tr }}</label>
             <div class="control-label">
-              <multiselect ng-model="mailboxes.add.owner" options="o.display for o in owners" data-compare-by="name" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+              <multiselect ng-model="mailboxes.add.owner" options="o.display for o in owners" data-compare-by="name" data-header-key="header" data-divider-key="divider" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
             </div>
           </div>
           <input class="hide" type="submit" ng-disabled="mailboxadd_form.$invalid || mailboxes.add.busy"/>
diff --git a/src/views/email.js b/src/views/email.js
index fad9e4e98..b411a1350 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -4,7 +4,7 @@
 /* global $ */
 /* global async */
 
-angular.module('Application').controller('EmailController', ['$scope', '$location', '$timeout', '$routeParams', 'Client', function ($scope, $location, $timeout, $routeParams, Client) {
+angular.module('Application').controller('EmailController', ['$scope', '$location', '$translate', '$timeout', '$routeParams', 'Client', function ($scope, $location, $translate, $timeout, $routeParams, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
 
     var domainName = $routeParams.domain;
@@ -763,7 +763,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             if (error) return console.error('Unable to get user listing.', error);
 
             // ensure we have a display value available
-            $scope.owners.push({ header: true, display: 'Users' });
+            $scope.owners.push({ header: true, display: $translate.instant('email.mailboxboxDialog.usersHeader') });
             users.forEach(function (u) {
                 $scope.owners.push({ display: u.username || u.email, id: u.id, type: 'user' });
             });
@@ -771,7 +771,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             Client.getGroups(function (error, groups) {
                 if (error) return console.error('Unable to get group listing.', error);
 
-                $scope.owners.push({ header: true, display: 'Groups' });
+                $scope.owners.push({ header: true, display: $translate.instant('email.mailboxboxDialog.groupsHeader') });
                 groups.forEach(function (g) {
                     $scope.owners.push({ display: g.name, id: g.id, type: 'group' });
                 });