diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
index 97e6ebcb7a..5c7ec10629 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
@@ -63,6 +63,7 @@ final class PhabricatorTypeaheadCommonDatasourceController
       case 'allmailable':
         $need_users = true;
         $need_lists = true;
+        $need_projs = true;
         break;
       case 'projects':
         $need_projs = true;
diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
index a1cde86956..ae658d51b4 100644
--- a/src/view/form/control/AphrontFormTokenizerControl.php
+++ b/src/view/form/control/AphrontFormTokenizerControl.php
@@ -88,8 +88,8 @@ final class AphrontFormTokenizerControl extends AphrontFormControl {
       'usersorprojects' => pht('Type a user or project name...'),
       'searchowner'     => pht('Type a user name...'),
       'accounts'        => pht('Type a user name...'),
-      'mailable'        => pht('Type a user or mailing list...'),
-      'allmailable'     => pht('Type a user or mailing list...'),
+      'mailable'        => pht('Type a user, project, or mailing list...'),
+      'allmailable'     => pht('Type a user, project, or mailing list...'),
       'searchproject'   => pht('Type a project name...'),
       'projects'        => pht('Type a project name...'),
       'repositories'    => pht('Type a repository name...'),