diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 8f9099af..6039ea76 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -13,6 +13,7 @@
 Changes since 2.3.6 release
 ----------------------------------------------------------------
   - lt.lang translation update
+  - when enabling/disabling a mailbox, also update the corresponding alias
 
 Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
diff --git a/edit-mailbox.php b/edit-mailbox.php
index d08dd80d..b59439ce 100644
--- a/edit-mailbox.php
+++ b/edit-mailbox.php
@@ -162,6 +162,17 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
       else {
          db_log ($SESSID_USERNAME, $fDomain, 'edit_mailbox', $fUsername);
 
+         $result = db_query ("UPDATE $table_alias SET active=$sqlActive WHERE address='$fUsername' AND domain='$fDomain'");
+         if ($result['rows'] != 1)
+         {
+            $error = 1;
+            $tMessage = $PALANG['pEdit_mailbox_result_error'];
+         }
+         else
+         {
+            db_log ($SESSID_USERNAME, $fDomain, 'edit_alias_state', $fUsername);
+         }
+
          header ("Location: list-virtual.php?domain=$fDomain");
          exit(0);
       }