From e60177f14aaed7842ee6cb4bf287121ea077a5fd Mon Sep 17 00:00:00 2001
From: user <pengfluf@tutanota.com>
Date: Mon, 30 Apr 2018 00:58:08 +0300
Subject: [PATCH] Sending messages is allowed; PM related texts moved

---
 website/client/components/userMenu/inbox.vue | 10 +---------
 website/common/locales/en/generic.json       | 10 ----------
 website/common/locales/en/groups.json        |  9 ++++++++-
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue
index a7d8895a5f..92c94aa9b5 100644
--- a/website/client/components/userMenu/inbox.vue
+++ b/website/client/components/userMenu/inbox.vue
@@ -22,7 +22,7 @@
         // .col-8.to-form(v-if='displayCreate')
         //   strong To:
         // b-form-input
-    .row(v-if="!this.user.inbox.optOut")
+    .row
       .col-4.sidebar
         .search-section
           b-form-input(:placeholder="$t('search')", v-model='search')
@@ -51,14 +51,6 @@
         .new-message-row(v-if='selectedConversation.key')
           textarea(v-model='newMessage')
           button.btn.btn-secondary(@click='sendPrivateMessage()') Send
-    .row(v-else)
-      .col-12
-        .caption-disabled
-          .svg-icon.envelope(v-html="icons.messageIcon")
-          h3 {{$t('disabledPMCaptionTitle')}}
-          p.text-center {{$t('disabledPMCaptionLine1')}}
-          p.text-center {{$t('disabledPMCaptionLine2')}}
-          button.btn.btn-primary(@click="toggleOpt()") {{$t('PMEnable')}}
 </template>
 
 <style lang="scss" scoped>
diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json
index 448afecabf..260ace67a4 100644
--- a/website/common/locales/en/generic.json
+++ b/website/common/locales/en/generic.json
@@ -289,16 +289,6 @@
   "messages": "Messages",
   "emptyMessagesLine1": "You don't have any messages",
   "emptyMessagesLine2": "Send a message to start a conversation!",
-  "PMEnable": "Enable",
-  "PMEnableFull": "Enable private messages",
-  "PMDisable": "Disable",
-  "PMDisableFull": "Disable private messages",
-  "PMDisableConfirmation": "Are you sure you want to disable private messages? No one will able to send you messages, though you can enable private messages at any time.",
-  "PMEnabledOptPopoverText": "When private messages are disabled, no one can send them to you, though you can enable this option at any time.",
-  "PMDisabledOptPopoverText": "Enable private messages so you can chat again!",
-  "disabledPMCaptionTitle": "Private messages are disabled",
-  "disabledPMCaptionLine1": "Private messages are disabled and no one can send them to you.",
-  "disabledPMCaptionLine2": "You can enable this option at any time.",
   "userSentMessage": "<span class=\"notification-bold\"><%= user %></span> sent you a message",
   "letsgo": "Let's Go!",
   "selected": "Selected",
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 706934318d..ee5ea938ef 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -132,7 +132,14 @@
   "possessiveParty": "<%= name %>'s Party",
   "clearAll": "Delete All Messages",
   "confirmDeleteAllMessages": "Are you sure you want to delete all messages in your inbox? Other users will still see messages you have sent to them.",
-  "optOutPopover": "Don't like private messages? Click to completely opt out",
+  "PMEnable": "Enable",
+  "PMEnableFull": "Enable private messages",
+  "PMDisable": "Disable",
+  "PMDisableFull": "Disable private messages",
+  "PMDisableConfirmation": "Are you sure you want to disable private messages? You still will be able to send messages, but no one will be able to send them to you.",
+  "PMEnabledOptPopoverText": "When private messages are disabled, you still can send messages, but no one can send them to you.",
+  "PMDisabledOptPopoverText": "Enable this option to be able to receive messages.",
+  "disabledPMCaptionTitle": "Private messages are disabled. You still can send messages, but no one can send them to you.",
   "block": "Block",
   "unblock": "Un-block",
   "pm-reply": "Send a reply",