diff --git a/.cmds b/.cmds
index d2ed5fa0b..c870eadaf 100644
--- a/.cmds
+++ b/.cmds
@@ -7,8 +7,8 @@ yarn upgrade xxx@1.2.3
 tx pull -a
 
 # dependencies checker (checking only)
-npm-check --skip-unused --save-exact
 yarn outdated
+npm-check --skip-unused --save-exact
 
 # webpack
 webpack --color --watch
diff --git a/README.md b/README.md
index a7b215429..806100b72 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,25 @@
-RainLoop Webmail [![Build Status](https://travis-ci.org/RainLoop/rainloop-webmail.svg?branch=master)](https://travis-ci.org/RainLoop/rainloop-webmail) [![devDependency Status](https://david-dm.org/RainLoop/rainloop-webmail/dev-status.svg)](https://david-dm.org/RainLoop/rainloop-webmail?type=dev)
-==================
-
-Simple, modern & fast web-based email client.
-
-Modest system requirements, decent performance, simple installation and upgrade, no database required - all these make RainLoop Webmail a perfect choice for your email solution.
+<div align="center">
+  <a href="https://github.com/RainLoop/rainloop-webmail">
+    <img width="200" heigth="200" src="https://www.rainloop.net/static/img/logo-256x256-tiny.png">
+  </a>
+  <br>
+  <h1>RainLoop Webmail</h1>
+  <br>
+  <p>
+    Simple, modern &amp; fast web-based email client.
+  </p>
+  <p>
+    Modest system requirements, decent performance, simple installation and upgrade, no database required
+    - all these make RainLoop Webmail a perfect choice for your email solution.
+  </p>
+  <h2></h2>
+  <br>
+</div>
 
 For more information about the product, check [rainloop.net](http://www.rainloop.net/).
 
 Information about installing the product, check the [documentation page](http://www.rainloop.net/docs/installation/).
 
-## Attention
-
-This is a developer version of RainLoop Webmail.
-It's not recommended to use in production environment.
-
 ## License
 
 **RainLoop Webmail (Community edition)** is released under
diff --git a/rainloop/v/0.0.0/app/localization/admin/de_DE.yml b/rainloop/v/0.0.0/app/localization/admin/de_DE.yml
index 531b15295..133f191ed 100644
--- a/rainloop/v/0.0.0/app/localization/admin/de_DE.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/de_DE.yml
@@ -26,6 +26,7 @@ de_DE:
     LABEL_ALLOW_LANGUAGES_ON_SETTINGS: "Sprachauswahl in den Einstellungen zulassen"
     LABEL_ALLOW_THEMES_ON_SETTINGS: "Themaauswahl in den Einstellungen zulassen"
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Hintergrundauswahl in den Einstellungen zulassen"
+    LABEL_NEW_FOLDER_MOVE: "Neue \"Verschieben nach\"-Schaltfläche"
     LABEL_SHOW_THUMBNAILS: "Vorschaubilder anzeigen (Anhänge)"
     LABEL_ALLOW_GRAVATAR: "Gravatar erlauben"
     LEGEND_MAIN: "Allgemein"
diff --git a/rainloop/v/0.0.0/app/localization/admin/lt_LT.yml b/rainloop/v/0.0.0/app/localization/admin/lt_LT.yml
index 3b374275f..53caceff6 100644
--- a/rainloop/v/0.0.0/app/localization/admin/lt_LT.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/lt_LT.yml
@@ -9,7 +9,7 @@ lt_LT:
   TABS_LABELS:
     LABEL_GENERAL_NAME: "Pagrindiniai"
     LABEL_LOGIN_NAME: "Prisijungimo vardas"
-    LABEL_BRANDING_NAME: "Prekės ženklo derinimas"
+    LABEL_BRANDING_NAME: "Įdaguoti"
     LABEL_CONTACTS_NAME: "Kontaktai"
     LABEL_DOMAINS_NAME: "Domenai"
     LABEL_SECURITY_NAME: "Sauga"
@@ -26,6 +26,7 @@ lt_LT:
     LABEL_ALLOW_LANGUAGES_ON_SETTINGS: "Leisti kalbos keitimą nustatymuose"
     LABEL_ALLOW_THEMES_ON_SETTINGS: "Leisti temos keitimą nustatymuose"
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Leisti keisti foną nustatymuose"
+    LABEL_NEW_FOLDER_MOVE: "Naujas \"\"perkelti į katalogą\" mygtukas"
     LABEL_SHOW_THUMBNAILS: "Rodyti miniatiūrą (prisegtuko)"
     LABEL_ALLOW_GRAVATAR: "Leisti naudoti Gravatar'ą"
     LEGEND_MAIN: "Pagrindinis"
diff --git a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
index ce55a74bc..1e8da9fce 100644
--- a/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/nl_NL.yml
@@ -26,6 +26,7 @@ nl_NL:
     LABEL_ALLOW_LANGUAGES_ON_SETTINGS: "Sta taalselectie toe in het instellingen scherm"
     LABEL_ALLOW_THEMES_ON_SETTINGS: "Sta thema selectie toe in het instellingen scherm"
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Sta achtergrond selectie toe in het instellingen scherm"
+    LABEL_NEW_FOLDER_MOVE: "Nieuwe \"verplaats naar map\" knop"
     LABEL_SHOW_THUMBNAILS: "Toon miniaturen (bijlage)"
     LABEL_ALLOW_GRAVATAR: "Toon Gravatar"
     LEGEND_MAIN: "Diverse"
diff --git a/rainloop/v/0.0.0/app/localization/admin/pt_BR.yml b/rainloop/v/0.0.0/app/localization/admin/pt_BR.yml
index c20706704..e68f462c1 100644
--- a/rainloop/v/0.0.0/app/localization/admin/pt_BR.yml
+++ b/rainloop/v/0.0.0/app/localization/admin/pt_BR.yml
@@ -26,6 +26,7 @@ pt_BR:
     LABEL_ALLOW_LANGUAGES_ON_SETTINGS: "Permitir escolha do idioma na tela de configurações"
     LABEL_ALLOW_THEMES_ON_SETTINGS: "Permitir escolha do tema na tela de configurações"
     LABEL_ALLOW_BACKGROUND_ON_SETTINGS: "Permitir escolha de Imagem de Fundo na tela de configurações"
+    LABEL_NEW_FOLDER_MOVE: "Novo botão \"Mover para pasta\""
     LABEL_SHOW_THUMBNAILS: "Mostrar imagem miniatura (Anexos)"
     LABEL_ALLOW_GRAVATAR: "Permitir Gravatar"
     LEGEND_MAIN: "Principal"
@@ -89,6 +90,7 @@ pt_BR:
   TAB_DOMAINS:
     LEGEND_DOMAINS: "Domínios"
     BUTTON_ADD_DOMAIN: "Adicionar Domínio"
+    BUTTON_ADD_ALIAS: "Adicionar apelido (Alias)"
     DELETE_ARE_YOU_SURE: "Você tem certeza?"
     HTML_DOMAINS_HELPER: |
       Lista dos domínios com acesso permitido ao webmail.
@@ -186,6 +188,12 @@ pt_BR:
       Note que chave de assinatura é ativada apenas para um único domínio.
       <br /><br />
       Uma vez iniciado, o processo de ativação não poderá ser interrompido ou cancelado.
+  POPUPS_DOMAIN_ALIAS:
+    TITLE_ADD_DOMAIN_ALIAS: "Adicionar apelido (Alias)"
+    LABEL_ALIAS: "Apelido (Alias)"
+    LABEL_DOMAIN: "Domínio"
+    BUTTON_CLOSE: "Fechar"
+    BUTTON_ADD: "Adicionar"
   POPUPS_DOMAIN:
     TITLE_ADD_DOMAIN: "Adicionar Domínio"
     TITLE_ADD_DOMAIN_WITH_NAME: "Adicionar Domínio \"%NAME%\""
diff --git a/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml b/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
index 3c2b85090..2aec0ea97 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/de_DE.yml
@@ -145,6 +145,7 @@ de_DE:
     PRINT_LABEL_ATTACHMENTS: "Anhänge"
     MESSAGE_LOADING: "Nachricht wird geladen"
     MESSAGE_VIEW_DESC: "Wählen Sie eine Nachricht aus der Liste aus, um sie anzuzeigen."
+    MESSAGE_VIEW_MOVE_DESC: "Klicke auf den Ordnernamen auf der linken Seite, um die Nachricht zu verschieben."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Passwort"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP-signierte Nachricht (klicken, um zu überprüfen)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP-verschlüsselte Nachricht (klicken, um zu entschlüsseln)"
@@ -417,6 +418,7 @@ de_DE:
     ERROR_FILE_TYPE: "Ungültiger Dateityp"
     ERROR_UNKNOWN: "Ein unbekannter Fehler trat beim Hochladen auf"
   EDITOR:
+    TEXT_SWITCHER_PLAINT_TEXT: "HTML <-> TEXT"
     TEXT_SWITCHER_RICH_FORMATTING: "Formatierter Text (Rich Text)"
     TEXT_SWITCHER_CONFIRM: "Alle Textformatierungen und Grafiken gehen verloren. Wollen Sie wirklich fortfahren?"
   SETTINGS_LABELS:
diff --git a/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml b/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
index ac5ff2449..2765ed78a 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
@@ -145,6 +145,7 @@ fr_FR:
     PRINT_LABEL_ATTACHMENTS: "Pièces jointes"
     MESSAGE_LOADING: "Chargement"
     MESSAGE_VIEW_DESC: "Sélectionner un message dans la liste pour l'afficher ici."
+    MESSAGE_VIEW_MOVE_DESC: "Cliquez sur le nom du dossier dans le panneau de gauche pour sélectionner la destination."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Mot de passe"
     PGP_SIGNED_MESSAGE_DESC: "Message signé par OpenPGP (cliquer pour vérifier)"
     PGP_ENCRYPTED_MESSAGE_DESC: "Message chiffré par OpenPGP (cliquer pour déchiffrer)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
index df664c73c..df7291a68 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/hu_HU.yml
@@ -145,6 +145,7 @@ hu_HU:
     PRINT_LABEL_ATTACHMENTS: "Mellékletek"
     MESSAGE_LOADING: "Betöltés"
     MESSAGE_VIEW_DESC: "Válassz egy üzenetet a listából, hogy megjelenjen itt."
+    MESSAGE_VIEW_MOVE_DESC: "A cél kiválasztásához a bal oldali panelen kattints a mappa nevére."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Jelszó"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP aláírt üzenet (kattints az ellenőrzéshez)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP kódolt üzenet (kattints a visszafejtéshez)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml b/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
index caf5e7162..2aab8232b 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ja_JP.yml
@@ -145,6 +145,7 @@ ja_JP:
     PRINT_LABEL_ATTACHMENTS: "添付ファイル"
     MESSAGE_LOADING: "読み込み中"
     MESSAGE_VIEW_DESC: "選択したメールがここに表示されます。"
+    MESSAGE_VIEW_MOVE_DESC: "左側のパネルでフォルダ名をクリックして移動先を選択します。"
     PGP_PASSWORD_INPUT_PLACEHOLDER: "パスワード"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP 署名済みメッセージ (クリックして検証)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP 暗号化メッセージ (クリックして復号化)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml b/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
index c12ad76b2..6fa0623cb 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/lt_LT.yml
@@ -145,6 +145,7 @@ lt_LT:
     PRINT_LABEL_ATTACHMENTS: "Priedai"
     MESSAGE_LOADING: "Kraunasi"
     MESSAGE_VIEW_DESC: "Pasirinkite žinutę sąraše, kad matytumėte jos turinį čia."
+    MESSAGE_VIEW_MOVE_DESC: "Kairėje pasirinkite katalogą, į kurį norite perkelti."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Slaptažodis"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP pasirašytas pranešimas (spustelkite patikrinimui)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP šifruotas pranešimas (spustelkite iššifravimui)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
index b2c98da47..35f6f460e 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/nb_NO.yml
@@ -145,6 +145,7 @@ nb_NO:
     PRINT_LABEL_ATTACHMENTS: "Vedlegg"
     MESSAGE_LOADING: "Laster inn"
     MESSAGE_VIEW_DESC: "Trykk på en melding for å lese den"
+    MESSAGE_VIEW_MOVE_DESC: "Trykk på mappenavn i panelet til venstre for å velge mål."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Passord"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP-signert melding (trykk for å bekrefte)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP-kryptert melding (trykk for å dekryptere)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
index b03c8457a..739afa290 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml
@@ -145,6 +145,7 @@ nl_NL:
     PRINT_LABEL_ATTACHMENTS: "Bijlagen"
     MESSAGE_LOADING: "Bericht ophalen"
     MESSAGE_VIEW_DESC: "Selecteer een bericht in de lijst om hier te bekijken"
+    MESSAGE_VIEW_MOVE_DESC: "Klik op de doel map in het linker paneel."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Wachtwoord"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP ondertekend bericht (klik om te verifiëren)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP versleuteld bericht (klik om te ontsleutelen)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml b/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
index 3d8e8ed77..e22839b45 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/pt_BR.yml
@@ -102,6 +102,7 @@ pt_BR:
     BUTTON_BACK: "Voltar"
     BUTTON_CLOSE: "Fechar"
     BUTTON_DELETE: "Excluir"
+    BUTTON_UNSUBSCRIBE: "Cancelar a assinatura desta lista"
     BUTTON_ARCHIVE: "Arquivar"
     BUTTON_SPAM: "Lixo Eletrônico"
     BUTTON_NOT_SPAM: "Não é Lixo Eletrônico"
@@ -144,6 +145,7 @@ pt_BR:
     PRINT_LABEL_ATTACHMENTS: "Anexos"
     MESSAGE_LOADING: "Carregando"
     MESSAGE_VIEW_DESC: "Selecione uma mensagem para visualizá-la aqui."
+    MESSAGE_VIEW_MOVE_DESC: "Clique no nome da pasta no painel esquerdo para selecionar o destino."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Senha"
     PGP_SIGNED_MESSAGE_DESC: "Mensagem assinada com OpenPGP (clique para verificar)"
     PGP_ENCRYPTED_MESSAGE_DESC: "Mensagem criptografada com OpenPGP (clique para descriptografar)"
@@ -415,6 +417,7 @@ pt_BR:
     ERROR_FILE_TYPE: "Tipo de arquivo inválido"
     ERROR_UNKNOWN: "Ocorreu um erro de envio de arquivo desconhecido"
   EDITOR:
+    TEXT_SWITCHER_PLAINT_TEXT: "HTML <-> TEXTO"
     TEXT_SWITCHER_RICH_FORMATTING: "Formatação avançada"
     TEXT_SWITCHER_CONFIRM: "A formatação de texto e as imagens serão perdidas. Tem certeza de que deseja continuar?"
   SETTINGS_LABELS:
@@ -461,6 +464,7 @@ pt_BR:
     LABEL_AUTOLOGOUT: "Deslogar Automaticamente"
     AUTOLOGIN_NEVER_OPTION_NAME: "Nunca"
     AUTOLOGIN_MINUTES_OPTION_NAME: "%MINUTES% minutos"
+    AUTOLOGIN_HOURS_OPTION_NAME: "%HOURS% hora(s)"
   SETTINGS_GENERAL:
     LEGEND_GENERAL: "Geral"
     LABEL_LANGUAGE: "Idioma"
@@ -526,6 +530,7 @@ pt_BR:
   SETTINGS_FOLDERS:
     LEGEND_FOLDERS: "Lista de pastas"
     BUTTON_CREATE: "Criar pasta"
+    BUTTON_SYSTEM: "Pastas do Sistema"
     BUTTON_DELETE: "Excluir"
     BUTTON_SUBSCRIBE: "Acompanhar"
     BUTTON_UNSUBSCRIBE: "Não acompanhar"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
index 9ff286b76..a1b6acb2b 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/ru_RU.yml
@@ -145,7 +145,7 @@ ru_RU:
     PRINT_LABEL_ATTACHMENTS: "Файлы"
     MESSAGE_LOADING: "Загрузка"
     MESSAGE_VIEW_DESC: "Выберите сообщение для просмотра."
-    MESSAGE_VIEW_MOVE_DESC: "Выберите папку для перемещения..."
+    MESSAGE_VIEW_MOVE_DESC: "Выберите имя папки в левой панели, чтобы переместить сообщения."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Пароль"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP подписанное сообщение (нажмите, чтобы подтвердить)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP шифрованное сообщение (нажмите, чтобы расшифровать)"
diff --git a/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml b/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
index 7988e5d60..5cef863cb 100644
--- a/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
+++ b/rainloop/v/0.0.0/app/localization/webmail/sv_SE.yml
@@ -145,6 +145,7 @@ sv_SE:
     PRINT_LABEL_ATTACHMENTS: "Bilagor"
     MESSAGE_LOADING: "Laddar"
     MESSAGE_VIEW_DESC: "Välj meddelande i listan att visa här."
+    MESSAGE_VIEW_MOVE_DESC: "Klicka på mapp till vänster för att välja mål mapp."
     PGP_PASSWORD_INPUT_PLACEHOLDER: "Lösenord"
     PGP_SIGNED_MESSAGE_DESC: "OpenPGP signerat meddelande (klicka för att verifiera)"
     PGP_ENCRYPTED_MESSAGE_DESC: "OpenPGP krypterat meddelande (klicka för att dekryptera)"