diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index bda812f68b2a476c9eec13e36c201b6dd57c6300..4fc891f8e845d8ff65e442e14452aa29e07b03a7 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `addons` (
 
 CREATE TABLE IF NOT EXISTS `sys_mailqueue` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `from` varchar(255) NOT NULL DEFAULT '',
+  `from_address` varchar(255) NOT NULL DEFAULT '',
   `recipients` text NOT NULL,
   `mail_content` mediumblob NOT NULL,
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index cf0586b612900d68e8d352c82f1854bdcf753ff3..c3d17421d8c30371f0984de5da5ad33c83d22283 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1591,7 +1591,7 @@ CREATE TABLE `sys_log` (
 
 CREATE TABLE IF NOT EXISTS `sys_mailqueue` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `from` varchar(255) NOT NULL DEFAULT '',
+  `from_address` varchar(255) NOT NULL DEFAULT '',
   `recipients` text NOT NULL,
   `mail_content` mediumblob NOT NULL,
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
index a3256b5ff6ed121f523a6f42c9d0eab88630547d..209cb5bd4369f3a60cc8363d4cb55da63ff7b54c 100644
--- a/interface/lib/classes/ispcmail.inc.php
+++ b/interface/lib/classes/ispcmail.inc.php
@@ -866,7 +866,7 @@ class ispcmail {
 				// Send mail:
 
 				$id = $mail['id'];
-				$from = $mail['from'];
+				$from = $mail['from_address'];
 				$recipients = explode("\n", $mail['recipients']);
 				$mail_content = $mail['mail_content'];
 
@@ -914,7 +914,7 @@ class ispcmail {
          */
 	private function add_to_queue($from, $recipients, $mail_content) {
 		global $app;
-		$app->db->query('INSERT INTO `sys_mailqueue` (`from`, `recipients`, `mail_content`) VALUES (?,?,?)', $from, implode("\n", $recipients), $mail_content);
+		$app->db->query('INSERT INTO `sys_mailqueue` (`from_address`, `recipients`, `mail_content`) VALUES (?,?,?)', $from, implode("\n", $recipients), $mail_content);
         }
 
 	/**
diff --git a/server/lib/classes/ispcmail.inc.php b/server/lib/classes/ispcmail.inc.php
index 93d7b6069c998f3b8a769055476954281e80134a..3ffabe8c4fc70cc12bdedff935cd47c0895d2059 100644
--- a/server/lib/classes/ispcmail.inc.php
+++ b/server/lib/classes/ispcmail.inc.php
@@ -862,7 +862,7 @@ class ispcmail {
 				// Send mail:
 
 				$id = $mail['id'];
-				$from = $mail['from'];
+				$from = $mail['from_address'];
 				$recipients = explode("\n", $mail['recipients']);
 				$mail_content = $mail['mail_content'];
 
@@ -910,7 +910,7 @@ class ispcmail {
          */
 	private function add_to_queue($from, $recipients, $mail_content) {
 		global $app;
-		$app->db->query('INSERT INTO `sys_mailqueue` (`from`, `recipients`, `mail_content`) VALUES (?,?,?)', $from, implode("\n", $recipients), $mail_content);
+		$app->db->query('INSERT INTO `sys_mailqueue` (`from_address`, `recipients`, `mail_content`) VALUES (?,?,?)', $from, implode("\n", $recipients), $mail_content);
         }
 
 	/**