diff --git a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
--- a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
+++ b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
@@ -8,11 +8,11 @@
   }
 
   protected function getObjectPattern() {
-    return 'C[1-9]\d*';
+    return 'COMMIT[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
-    $id = (int)trim($pattern, 'C');
+    $id = (int)preg_replace('/^COMMIT/', '', $pattern);
 
     return id(new DiffusionCommitQuery())
       ->setViewer($viewer)
diff --git a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
--- a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
+++ b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
@@ -13,9 +13,7 @@
   }
 
   public function getObjectPrefix() {
-    // TODO: This conflicts with Countdown and will probably need to be
-    // changed eventually.
-    return 'C';
+    return 'COMMIT';
   }
 
 }