diff --git a/application/Espo/Controllers/Email.php b/application/Espo/Controllers/Email.php
index 4113b357d1..271dcf788e 100644
--- a/application/Espo/Controllers/Email.php
+++ b/application/Espo/Controllers/Email.php
@@ -110,7 +110,7 @@ class Email extends \Espo\Core\Controllers\Record
             }
         }
 
-        return $this->getRecordService()->sendTestEmail($data);
+        return $this->getRecordService()->sendTestEmail(get_object_vars($data));
     }
 
     public function postActionMarkAsRead($params, $data, $request)
diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php
index f550a1f0d2..315a9e83e9 100644
--- a/application/Espo/Core/Mail/Sender.php
+++ b/application/Espo/Core/Mail/Sender.php
@@ -96,7 +96,11 @@ class Sender
             'connection_config' => array()
         );
         if ($params['auth']) {
-            $opts['connection_class'] = 'login';
+            if (!empty($params['smtpAuthMechanism'])) {
+                $opts['connection_class'] = $params['smtpAuthMechanism'];
+            } else {
+                $opts['connection_class'] = 'login';
+            }
             $opts['connection_config']['username'] = $params['username'];
             $opts['connection_config']['password'] = $params['password'];
         }
@@ -135,7 +139,7 @@ class Sender
             'connection_config' => array()
         );
         if ($config->get('smtpAuth')) {
-            $opts['connection_class'] = 'login';
+            $opts['connection_class'] = $config->get('smtpAuthMechanism', 'login');
             $opts['connection_config']['username'] = $config->get('smtpUsername');
             $opts['connection_config']['password'] = $config->get('smtpPassword');
         }
diff --git a/client/modules/crm/src/views/task/list.js b/client/modules/crm/src/views/task/list.js
index 7bc72b0420..ea35441f4b 100644
--- a/client/modules/crm/src/views/task/list.js
+++ b/client/modules/crm/src/views/task/list.js
@@ -24,34 +24,12 @@
  *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
- ************************************************************************/ 
-    
-Espo.define('Crm:Views.Task.List', 'Views.List', function (Dep) {
+ ************************************************************************/
+
+Espo.define('crm:views/task/list', 'views/list', function (Dep) {
 
     return Dep.extend({
-    
-        actionSetCompleted: function (data) {
-            var id = data.id;
-            if (!id) {
-                return;
-            }            
-            var model = this.collection.get(id);
-            if (!model) {
-                return;
-            }
-            
-            model.set('status', 'Completed');
-            
-            this.listenToOnce(model, 'sync', function () {
-                this.notify(false);
-                this.collection.fetch();
-            }, this);
-            
-            this.notify('Saving...');
-            model.save();        
-            
-        },
-    
+
     });
-    
+
 });
diff --git a/client/modules/crm/src/views/task/record/list.js b/client/modules/crm/src/views/task/record/list.js
index 591013a112..7c62834d31 100644
--- a/client/modules/crm/src/views/task/record/list.js
+++ b/client/modules/crm/src/views/task/record/list.js
@@ -51,8 +51,7 @@ Espo.define('crm:views/task/record/list', 'views/record/list', function (Dep) {
 
             this.notify('Saving...');
             model.save();
-
-        },
+        }
 
     });