Merge branch 'stable'

application/Espo/Services/InboundEmail.php

@@ -945,7 +945,10 @@ class InboundEmail extends \Espo\Services\Record
             if ($emailAccount->get('fromName')) {
                 $smtpParams['fromName'] = $emailAccount->get('fromName');
             }
-            if (array_key_exists('password', $smtpParams)) {
+            if ($emailAccount->get('emailAddress')) {
+                $smtpParams['fromAddress'] = $emailAccount->get('emailAddress');
+            }
+            if (array_key_exists('password', $smtpParams) && is_string($smtpParams['password'])) {
                 $smtpParams['password'] = $this->getCrypt()->decrypt($smtpParams['password']);
             }
             return $smtpParams;

client/modules/crm/src/views/meeting/detail.js

@@ -98,6 +98,12 @@ Espo.define('crm:views/meeting/detail', 'views/detail', function (Dep) {
 
                 if (!contactIdList.length && !leadIdList.length && !userIdList.length) {
                     show = false;
+                } else if (
+                    userIdList.length === 1 && userIdList[0] === this.getUser().id
+                    &&
+                    this.model.getLinkMultipleColumn('users', 'status', this.getUser().id) === 'Accepted'
+                ) {
+                    show = false;
                 }
             }
 

client/src/views/email/fields/email-address-varchar.js

@@ -203,10 +203,6 @@ Espo.define('views/email/fields/email-address-varchar', ['views/fields/varchar',
         },
 
         addAddress: function (address, name, type, id) {
-            if (name) {
-                name = this.getHelper().escapeString(name);
-            }
-
             if (this.justAddedAddress) {
                 this.deleteAddress(this.justAddedAddress);
             }

frontend/less/espo/custom.less

@@ -1197,6 +1197,10 @@ select[multiple].input-sm {
     height: 90px !important;
 }
 
+optgroup {
+    font-weight: 600;
+}
+
 .input-group-btn > select.form-control {
     position: relative;
     display: inline-block;