diff --git a/database_updates.php b/database_updates.php
index e86c2aaa..e844d20b 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1088,11 +1088,20 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.7'");
     }
 
-    //if (CURRENT_DATABASE_VERSION == '0.5.7') {
-    //Insert queries here required to update to DB version 0.5.8
+    if (CURRENT_DATABASE_VERSION == '0.5.7') {
+        mysqli_query($mysqli, "ALTER TABLE `email_queue` ADD `email_status` TINYINT(1) NOT NULL DEFAULT '0' AFTER `email_id`");
+        mysqli_query($mysqli, "ALTER TABLE `email_queue` ADD `email_recipient_name` VARCHAR(255) NULL DEFAULT NULL AFTER `email_recipient`");
+        mysqli_query($mysqli, "ALTER TABLE `email_queue` ADD `email_failed_at` DATETIME NULL DEFAULT NULL AFTER `email_queued_at`");
+        mysqli_query($mysqli, "ALTER TABLE `email_queue` ADD `email_attempts` TINYINT(1) NOT NULL DEFAULT '0' AFTER `email_failed_at`");
 
-    // Then, update the database to the next sequential version
-    //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.8'");
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.8'");
+    }
+
+    //if (CURRENT_DATABASE_VERSION == '0.5.8') {
+        //Insert queries here required to update to DB version 0.5.9
+
+        // Then, update the database to the next sequential version
+        //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.9'");
     //}
 
 } else {
diff --git a/database_version.php b/database_version.php
index 8068bb3e..14eeb315 100644
--- a/database_version.php
+++ b/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "0.5.7");
+DEFINE("LATEST_DATABASE_VERSION", "0.5.8");
diff --git a/db.sql b/db.sql
index a86656e9..9b4126c7 100644
--- a/db.sql
+++ b/db.sql
@@ -464,12 +464,16 @@ DROP TABLE IF EXISTS `email_queue`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `email_queue` (
   `email_id` int(11) NOT NULL AUTO_INCREMENT,
+  `email_status` tinyint(1) NOT NULL DEFAULT 0,
   `email_recipient` varchar(255) NOT NULL,
+  `email_recipient_name` varchar(255) DEFAULT NULL,
   `email_from` varchar(255) NOT NULL,
   `email_from_name` varchar(255) NOT NULL,
   `email_subject` varchar(255) NOT NULL,
   `email_content` longtext NOT NULL,
   `email_queued_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `email_failed_at` datetime DEFAULT NULL,
+  `email_attempts` tinyint(1) NOT NULL DEFAULT 0,
   `email_sent_at` datetime DEFAULT NULL,
   PRIMARY KEY (`email_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
@@ -1612,4 +1616,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-06-14 16:55:33
+-- Dump completed on 2023-06-20 19:53:31