diff --git a/upgrades/5.8.2-5.8.3/data.json b/upgrades/5.8.2-5.8.3/data.json
new file mode 100644
index 0000000000..bdca4f6cfd
--- /dev/null
+++ b/upgrades/5.8.2-5.8.3/data.json
@@ -0,0 +1,4 @@
+{
+    "manifest": {
+    }
+}
\ No newline at end of file
diff --git a/upgrades/5.8.2-5.8.3/scripts/AfterUpgrade.php b/upgrades/5.8.2-5.8.3/scripts/AfterUpgrade.php
new file mode 100644
index 0000000000..f1309b332d
--- /dev/null
+++ b/upgrades/5.8.2-5.8.3/scripts/AfterUpgrade.php
@@ -0,0 +1,31 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+class AfterUpgrade
+{
+    public function run($container)
+    {
+        $config = $container->get('config');
+        $config->set('streamEmailWithContentEntityTypeList', ['Case']);
+        $config->save();
+    }
+}
diff --git a/upgrades/5.8.2-5.8.3/scripts/BeforeUpgrade.php b/upgrades/5.8.2-5.8.3/scripts/BeforeUpgrade.php
new file mode 100644
index 0000000000..84910bb69a
--- /dev/null
+++ b/upgrades/5.8.2-5.8.3/scripts/BeforeUpgrade.php
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/
+
+class BeforeUpgrade
+{
+    public function run($container)
+    {
+        $pdo = $container->get('entityManager')->getPDO();
+
+        $query = "
+            UPDATE email_account SET port = NULL WHERE port = ''
+        ";
+        try {
+            $sth = $pdo->prepare($query);
+            $sth->execute();
+        } catch (\Exception $e) {}
+
+        $query = "
+            UPDATE inbound_email SET port = NULL WHERE port = ''
+        ";
+        try {
+            $sth = $pdo->prepare($query);
+            $sth->execute();
+        } catch (\Exception $e) {}
+    }
+}
diff --git a/upgrades/5.8/scripts/AfterUpgrade.php b/upgrades/5.8/scripts/AfterUpgrade.php
index ee18cb7499..186d0dd54d 100644
--- a/upgrades/5.8/scripts/AfterUpgrade.php
+++ b/upgrades/5.8/scripts/AfterUpgrade.php
@@ -32,6 +32,7 @@ class AfterUpgrade
 
         $config = $container->get('config');
         $config->set('personNameFormat', 'firstLast');
+        $config->set('streamEmailWithContentEntityTypeList', ['Case']);
         $config->save();
     }
 
diff --git a/upgrades/5.8/scripts/BeforeUpgrade.php b/upgrades/5.8/scripts/BeforeUpgrade.php
index 0158fd2c0c..ff82a6b10e 100644
--- a/upgrades/5.8/scripts/BeforeUpgrade.php
+++ b/upgrades/5.8/scripts/BeforeUpgrade.php
@@ -62,5 +62,22 @@ class BeforeUpgrade
             $sth = $pdo->prepare($query);
             $sth->execute();
         } catch (\Exception $e) {}
+
+
+        $query = "
+            UPDATE email_account SET port = NULL WHERE port = ''
+        ";
+        try {
+            $sth = $pdo->prepare($query);
+            $sth->execute();
+        } catch (\Exception $e) {}
+
+        $query = "
+            UPDATE inbound_email SET port = NULL WHERE port = ''
+        ";
+        try {
+            $sth = $pdo->prepare($query);
+            $sth->execute();
+        } catch (\Exception $e) {}
     }
 }