diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index 8c68cc98ca..698faec0e0 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -497,8 +497,8 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
     $phid = $object->getPHID();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("E{$id}: {$title}")
-      ->addHeader('Thread-Topic', "E{$id}: {$phid}");
+      ->setSubject("Z{$id}: {$title}")
+      ->addHeader('Thread-Topic', "Z{$id}: {$phid}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php b/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
index 95bea86fee..e926d3cfc5 100644
--- a/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
+++ b/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
@@ -9,13 +9,11 @@ final class ConpherenceThreadMailReceiver
   }
 
   protected function getObjectPattern() {
-    // TODO: Only recognize "Z" once we get closer to shipping Calendar.
-    return '[EZ][1-9]\d*';
+    return 'Z[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
-    // TODO: Only recognize "Z" once we get closer to shipping Calendar.
-    $id = (int)trim($pattern, 'EZ');
+    $id = (int)trim($pattern, 'Z');
 
     return id(new ConpherenceThreadQuery())
       ->setViewer($viewer)