diff --git a/post/setting.php b/post/setting.php
index bd6b6183..547bd506 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -50,7 +50,7 @@ if (isset($_POST['edit_company'])) {
 
 }
 
-if (isset($_POST['edit_mail_settings'])) {
+if (isset($_POST['edit_mail_smtp_settings'])) {
 
     validateAdminRole();
 
@@ -61,13 +61,8 @@ if (isset($_POST['edit_mail_settings'])) {
     $config_smtp_password = sanitizeInput($_POST['config_smtp_password']);
     $config_mail_from_email = sanitizeInput($_POST['config_mail_from_email']);
     $config_mail_from_name = sanitizeInput($_POST['config_mail_from_name']);
-    $config_imap_host = sanitizeInput($_POST['config_imap_host']);
-    $config_imap_username = sanitizeInput($_POST['config_imap_username']);
-    $config_imap_password = sanitizeInput($_POST['config_imap_password']);
-    $config_imap_port = intval($_POST['config_imap_port']);
-    $config_imap_encryption = sanitizeInput($_POST['config_imap_encryption']);
 
-    mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_port = $config_smtp_port, config_smtp_encryption = '$config_smtp_encryption', config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password', config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_imap_host = '$config_imap_host', config_imap_port = $config_imap_port, config_imap_encryption = '$config_imap_encryption', config_imap_username = '$config_imap_username', config_imap_password = '$config_imap_password' WHERE company_id = 1");
+    mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_port = $config_smtp_port, config_smtp_encryption = '$config_smtp_encryption', config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password', config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name' WHERE company_id = 1");
 
 
     //Update From Email and From Name if Invoice/Quote or Ticket fields are blank
@@ -96,9 +91,31 @@ if (isset($_POST['edit_mail_settings'])) {
     }
 
     // Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified mail settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified SMTP mail settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
 
-    $_SESSION['alert_message'] = "Mail Settings updated";
+    $_SESSION['alert_message'] = "SMTP Mail Settings updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_POST['edit_mail_imap_settings'])) {
+
+    validateAdminRole();
+
+    $config_imap_host = sanitizeInput($_POST['config_imap_host']);
+    $config_imap_username = sanitizeInput($_POST['config_imap_username']);
+    $config_imap_password = sanitizeInput($_POST['config_imap_password']);
+    $config_imap_port = intval($_POST['config_imap_port']);
+    $config_imap_encryption = sanitizeInput($_POST['config_imap_encryption']);
+
+    mysqli_query($mysqli,"UPDATE settings SET config_imap_host = '$config_imap_host', config_imap_port = $config_imap_port, config_imap_encryption = '$config_imap_encryption', config_imap_username = '$config_imap_username', config_imap_password = '$config_imap_password' WHERE company_id = 1");
+
+
+    // Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified IMAP mail settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "IMAP Mail Settings updated";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
diff --git a/settings_mail.php b/settings_mail.php
index 7de8d417..1db6612a 100644
--- a/settings_mail.php
+++ b/settings_mail.php
@@ -3,7 +3,7 @@ require_once("inc_all_settings.php"); ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-envelope mr-2"></i>Mail Settings</h3>
+            <h3 class="card-title"><i class="fas fa-fw fa-envelope mr-2"></i>SMTP Mail Settings</h3>
         </div>
         <div class="card-body">
             <form action="post.php" method="post" autocomplete="off">
@@ -87,6 +87,19 @@ require_once("inc_all_settings.php"); ?>
 
                 <hr>
 
+                <button type="submit" name="edit_mail_smtp_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+
+            </form>
+        </div>
+    </div>
+
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fas fa-fw fa-envelope mr-2"></i>IMAP Mail Settings</h3>
+        </div>
+        <div class="card-body">
+            <form action="post.php" method="post" autocomplete="off">
+
                 <div class="form-group">
                     <label>IMAP Host</label>
                     <div class="input-group">
@@ -148,13 +161,13 @@ require_once("inc_all_settings.php"); ?>
 
                 <hr>
 
-                <button type="submit" name="edit_mail_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+                <button type="submit" name="edit_mail_imap_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
 
             </form>
         </div>
     </div>
 
-<?php if (!empty($config_smtp_host) && !empty($config_smtp_port) && !empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_mail_from_email) && !empty($config_mail_from_name)) { ?>
+    <?php if (!empty($config_smtp_host) && !empty($config_smtp_port) && !empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_mail_from_email) && !empty($config_mail_from_name)) { ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
@@ -172,9 +185,9 @@ require_once("inc_all_settings.php"); ?>
         </div>
     </div>
 
-<?php } ?>
+    <?php } ?>
 
-<?php if (!empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_imap_host) && !empty($config_imap_port)) { ?>
+    <?php if (!empty($config_smtp_username) && !empty($config_smtp_password) && !empty($config_imap_host) && !empty($config_imap_port)) { ?>
 
     <div class="card card-dark">
         <div class="card-header py-3">
@@ -189,6 +202,6 @@ require_once("inc_all_settings.php"); ?>
         </div>
     </div>
 
-<?php } ?>
+    <?php } ?>
 
 <?php require_once("footer.php");