diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 9f83c2042e..4e001f9964 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1,197 +1,197 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'celerity_mapper.php' to rebuild
  * it.
  * @generated
  */
 
 celerity_register_resource_map(array(
   'aphront-dialog-view-css' =>
   array(
     'path' => '/res/771b987d/rsrc/css/aphront/dialog-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'aphront-form-view-css' =>
   array(
-    'path' => '/res/17285e65/rsrc/css/aphront/form-view.css',
+    'path' => '/res/51ec6383/rsrc/css/aphront/form-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'aphront-panel-view-css' =>
   array(
-    'path' => '/res/d1ce0c3d/rsrc/css/aphront/panel-view.css',
+    'path' => '/res/fe62e634/rsrc/css/aphront/panel-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'aphront-side-nav-view-css' =>
   array(
     'path' => '/res/1a16f19a/rsrc/css/aphront/side-nav-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'aphront-table-view-css' =>
   array(
     'path' => '/res/52b0191f/rsrc/css/aphront/table-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'aphront-tokenizer-control-css' =>
   array(
     'path' => '/res/a3d23074/rsrc/css/aphront/tokenizer.css',
     'type' => 'css',
     'requires' =>
     array(
       0 => 'aphront-typeahead-control-css',
     ),
   ),
   'aphront-typeahead-control-css' =>
   array(
     'path' => '/res/928df9f0/rsrc/css/aphront/typeahead.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'phabricator-standard-page-view' =>
   array(
     'path' => '/res/0eef6905/rsrc/css/application/base/standard-page-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'differential-changeset-view-css' =>
   array(
-    'path' => '/res/921d3a0c/rsrc/css/application/differential/changeset-view.css',
+    'path' => '/res/658d181a/rsrc/css/application/differential/changeset-view.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'differential-core-view-css' =>
   array(
     'path' => '/res/f750b85d/rsrc/css/application/differential/core.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'differential-table-of-contents-css' =>
   array(
     'path' => '/res/ebf6641c/rsrc/css/application/differential/table-of-contents.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'phabricator-directory-css' =>
   array(
     'path' => '/res/6a000601/rsrc/css/application/directory/phabricator-directory.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'phabricator-core-buttons-css' =>
   array(
     'path' => '/res/6e348ba4/rsrc/css/core/buttons.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'phabricator-core-css' =>
   array(
     'path' => '/res/39ce37c2/rsrc/css/core/core.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'syntax-highlighting-css' =>
   array(
     'path' => '/res/fb673ece/rsrc/css/core/syntax.css',
     'type' => 'css',
     'requires' =>
     array(
     ),
   ),
   'javelin-behavior-aphront-basic-tokenizer' =>
   array(
     'path' => '/res/8317d761/rsrc/js/application/core/behavior-tokenizer.js',
     'type' => 'js',
     'requires' =>
     array(
       0 => 'javelin-lib-dev',
     ),
   ),
   'javelin-behavior-differential-populate' =>
   array(
     'path' => '/res/9982573c/rsrc/js/application/differential/behavior-populate.js',
     'type' => 'js',
     'requires' =>
     array(
       0 => 'javelin-lib-dev',
     ),
   ),
   'javelin-init-dev' =>
   array(
     'path' => '/res/c57a9e89/rsrc/js/javelin/init.dev.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
   'javelin-init-prod' =>
   array(
     'path' => '/res/f0172c54/rsrc/js/javelin/init.min.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
   'javelin-lib-dev' =>
   array(
     'path' => '/res/3e747182/rsrc/js/javelin/javelin.dev.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
   'javelin-lib-prod' =>
   array(
     'path' => '/res/9438670e/rsrc/js/javelin/javelin.min.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
   'javelin-typeahead-dev' =>
   array(
     'path' => '/res/c81c0f01/rsrc/js/javelin/typeahead.dev.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
   'javelin-typeahead-prod' =>
   array(
     'path' => '/res/1da2d984/rsrc/js/javelin/typeahead.min.js',
     'type' => 'js',
     'requires' =>
     array(
     ),
   ),
 ));
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f3dc42394c..0e23449164 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1,250 +1,262 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
  * @generated
  */
 
 phutil_register_library_map(array(
   'class' =>
   array(
     'Aphront404Response' => 'aphront/response/404',
     'AphrontAjaxResponse' => 'aphront/response/ajax',
     'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
     'AphrontController' => 'aphront/controller',
     'AphrontDatabaseConnection' => 'storage/connection/base',
     'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration',
     'AphrontDefaultApplicationController' => 'aphront/default/controller',
     'AphrontDialogResponse' => 'aphront/response/dialog',
     'AphrontDialogView' => 'view/dialog',
     'AphrontErrorView' => 'view/form/error',
     'AphrontFileResponse' => 'aphront/response/file',
+    'AphrontFormCheckboxControl' => 'view/form/control/checkbox',
     'AphrontFormControl' => 'view/form/control/base',
     'AphrontFormFileControl' => 'view/form/control/file',
     'AphrontFormMarkupControl' => 'view/form/control/markup',
     'AphrontFormSelectControl' => 'view/form/control/select',
     'AphrontFormStaticControl' => 'view/form/control/static',
     'AphrontFormSubmitControl' => 'view/form/control/submit',
     'AphrontFormTextAreaControl' => 'view/form/control/textarea',
     'AphrontFormTextControl' => 'view/form/control/text',
     'AphrontFormTokenizerControl' => 'view/form/control/tokenizer',
     'AphrontFormView' => 'view/form/base',
     'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
     'AphrontNullView' => 'view/null',
     'AphrontPageView' => 'view/page/base',
     'AphrontPanelView' => 'view/layout/panel',
     'AphrontQueryConnectionException' => 'storage/exception/connection',
     'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost',
     'AphrontQueryCountException' => 'storage/exception/count',
     'AphrontQueryException' => 'storage/exception/base',
     'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing',
     'AphrontQueryParameterException' => 'storage/exception/parameter',
     'AphrontQueryRecoverableException' => 'storage/exception/recoverable',
     'AphrontRedirectResponse' => 'aphront/response/redirect',
     'AphrontRequest' => 'aphront/request',
     'AphrontResponse' => 'aphront/response/base',
     'AphrontSideNavView' => 'view/layout/sidenav',
     'AphrontTableView' => 'view/control/table',
     'AphrontURIMapper' => 'aphront/mapper',
     'AphrontView' => 'view/base',
     'AphrontWebpageResponse' => 'aphront/response/webpage',
     'CelerityAPI' => 'infratructure/celerity/api',
     'CelerityResourceController' => 'infratructure/celerity/controller',
     'CelerityResourceMap' => 'infratructure/celerity/map',
     'CelerityStaticResourceResponse' => 'infratructure/celerity/response',
     'ConduitAPIMethod' => 'applications/conduit/method/base',
     'ConduitAPIRequest' => 'applications/conduit/protocol/request',
     'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/connect',
     'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/creatediff',
     'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/setdiffproperty',
     'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
     'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find',
     'ConduitException' => 'applications/conduit/protocol/exception',
     'DifferentialAction' => 'applications/differential/constants/action',
     'DifferentialChangeType' => 'applications/differential/constants/changetype',
     'DifferentialChangeset' => 'applications/differential/storage/changeset',
     'DifferentialChangesetDetailView' => 'applications/differential/view/changesetdetailview',
     'DifferentialChangesetListView' => 'applications/differential/view/changesetlistview',
     'DifferentialChangesetParser' => 'applications/differential/parser/changeset',
     'DifferentialChangesetViewController' => 'applications/differential/controller/changesetview',
     'DifferentialController' => 'applications/differential/controller/base',
     'DifferentialDAO' => 'applications/differential/storage/base',
     'DifferentialDiff' => 'applications/differential/storage/diff',
     'DifferentialDiffProperty' => 'applications/differential/storage/diffproperty',
     'DifferentialDiffTableOfContentsView' => 'applications/differential/view/difftableofcontents',
     'DifferentialDiffViewController' => 'applications/differential/controller/diffview',
     'DifferentialHunk' => 'applications/differential/storage/hunk',
     'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
     'DifferentialRevision' => 'applications/differential/storage/revision',
     'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem',
     'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit',
     'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist',
     'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
     'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
     'Javelin' => 'infratructure/javelin/api',
     'LiskDAO' => 'storage/lisk/dao',
     'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
     'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
     'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
     'PhabricatorConduitController' => 'applications/conduit/controller/base',
     'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
     'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
     'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
     'PhabricatorController' => 'applications/base/controller/base',
     'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
     'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
     'PhabricatorDirectoryCategoryEditController' => 'applications/directory/controller/categoryedit',
     'PhabricatorDirectoryCategoryListController' => 'applications/directory/controller/categorylist',
     'PhabricatorDirectoryController' => 'applications/directory/controller/base',
     'PhabricatorDirectoryDAO' => 'applications/directory/storage/base',
     'PhabricatorDirectoryItem' => 'applications/directory/storage/item',
     'PhabricatorDirectoryItemDeleteController' => 'applications/directory/controller/itemdelete',
     'PhabricatorDirectoryItemEditController' => 'applications/directory/controller/itemedit',
     'PhabricatorDirectoryItemListController' => 'applications/directory/controller/itemlist',
     'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
     'PhabricatorFile' => 'applications/files/storage/file',
     'PhabricatorFileController' => 'applications/files/controller/base',
     'PhabricatorFileDAO' => 'applications/files/storage/base',
     'PhabricatorFileListController' => 'applications/files/controller/list',
     'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
     'PhabricatorFileURI' => 'applications/files/uri',
     'PhabricatorFileUploadController' => 'applications/files/controller/upload',
     'PhabricatorFileViewController' => 'applications/files/controller/view',
     'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
+    'PhabricatorMetaMTAController' => 'applications/metamta/controller/base',
+    'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base',
+    'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list',
+    'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail',
+    'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
     'PhabricatorPHID' => 'applications/phid/storage/phid',
     'PhabricatorPHIDAllocateController' => 'applications/phid/controller/allocate',
     'PhabricatorPHIDController' => 'applications/phid/controller/base',
     'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
     'PhabricatorPHIDListController' => 'applications/phid/controller/list',
     'PhabricatorPHIDType' => 'applications/phid/storage/type',
     'PhabricatorPHIDTypeEditController' => 'applications/phid/controller/typeedit',
     'PhabricatorPHIDTypeListController' => 'applications/phid/controller/typelist',
     'PhabricatorPeopleController' => 'applications/people/controller/base',
     'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
     'PhabricatorPeopleListController' => 'applications/people/controller/list',
     'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
     'PhabricatorStandardPageView' => 'view/page/standard',
     'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/common',
     'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base',
     'PhabricatorUser' => 'applications/people/storage/user',
     'PhabricatorUserDAO' => 'applications/people/storage/base',
   ),
   'function' =>
   array(
     '_qsprintf_check_scalar_type' => 'storage/qsprintf',
     '_qsprintf_check_type' => 'storage/qsprintf',
     'celerity_generate_unique_node_id' => 'infratructure/celerity/api',
     'celerity_register_resource_map' => 'infratructure/celerity/map',
     'javelin_render_tag' => 'infratructure/javelin/markup',
     'qsprintf' => 'storage/qsprintf',
     'queryfx' => 'storage/queryfx',
     'queryfx_all' => 'storage/queryfx',
     'queryfx_one' => 'storage/queryfx',
     'require_celerity_resource' => 'infratructure/celerity/api',
     'vqsprintf' => 'storage/qsprintf',
     'vqueryfx' => 'storage/queryfx',
     'xsprintf_query' => 'storage/qsprintf',
   ),
   'requires_class' =>
   array(
     'Aphront404Response' => 'AphrontResponse',
     'AphrontAjaxResponse' => 'AphrontResponse',
     'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
     'AphrontDefaultApplicationController' => 'AphrontController',
     'AphrontDialogResponse' => 'AphrontResponse',
     'AphrontDialogView' => 'AphrontView',
     'AphrontErrorView' => 'AphrontView',
     'AphrontFileResponse' => 'AphrontResponse',
+    'AphrontFormCheckboxControl' => 'AphrontFormControl',
     'AphrontFormControl' => 'AphrontView',
     'AphrontFormFileControl' => 'AphrontFormControl',
     'AphrontFormMarkupControl' => 'AphrontFormControl',
     'AphrontFormSelectControl' => 'AphrontFormControl',
     'AphrontFormStaticControl' => 'AphrontFormControl',
     'AphrontFormSubmitControl' => 'AphrontFormControl',
     'AphrontFormTextAreaControl' => 'AphrontFormControl',
     'AphrontFormTextControl' => 'AphrontFormControl',
     'AphrontFormTokenizerControl' => 'AphrontFormControl',
     'AphrontFormView' => 'AphrontView',
     'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
     'AphrontNullView' => 'AphrontView',
     'AphrontPageView' => 'AphrontView',
     'AphrontPanelView' => 'AphrontView',
     'AphrontQueryConnectionException' => 'AphrontQueryException',
     'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
     'AphrontQueryCountException' => 'AphrontQueryException',
     'AphrontQueryObjectMissingException' => 'AphrontQueryException',
     'AphrontQueryParameterException' => 'AphrontQueryException',
     'AphrontQueryRecoverableException' => 'AphrontQueryException',
     'AphrontRedirectResponse' => 'AphrontResponse',
     'AphrontSideNavView' => 'AphrontView',
     'AphrontTableView' => 'AphrontView',
     'AphrontWebpageResponse' => 'AphrontResponse',
     'CelerityResourceController' => 'AphrontController',
     'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
     'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
     'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
     'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
     'ConduitAPI_user_find_Method' => 'ConduitAPIMethod',
     'DifferentialChangeset' => 'DifferentialDAO',
     'DifferentialChangesetDetailView' => 'AphrontView',
     'DifferentialChangesetListView' => 'AphrontView',
     'DifferentialChangesetViewController' => 'DifferentialController',
     'DifferentialController' => 'PhabricatorController',
     'DifferentialDAO' => 'PhabricatorLiskDAO',
     'DifferentialDiff' => 'DifferentialDAO',
     'DifferentialDiffProperty' => 'DifferentialDAO',
     'DifferentialDiffTableOfContentsView' => 'AphrontView',
     'DifferentialDiffViewController' => 'DifferentialController',
     'DifferentialHunk' => 'DifferentialDAO',
     'DifferentialRevision' => 'DifferentialDAO',
     'DifferentialRevisionEditController' => 'DifferentialController',
     'DifferentialRevisionListController' => 'DifferentialController',
     'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
     'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
     'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
     'PhabricatorConduitController' => 'PhabricatorController',
     'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
     'PhabricatorConduitLogController' => 'PhabricatorConduitController',
     'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
     'PhabricatorController' => 'AphrontController',
     'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
     'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryCategoryListController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryController' => 'PhabricatorController',
     'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
     'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
     'PhabricatorFile' => 'PhabricatorFileDAO',
     'PhabricatorFileController' => 'PhabricatorController',
     'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
     'PhabricatorFileListController' => 'PhabricatorFileController',
     'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
     'PhabricatorFileUploadController' => 'PhabricatorFileController',
     'PhabricatorFileViewController' => 'PhabricatorFileController',
     'PhabricatorLiskDAO' => 'LiskDAO',
+    'PhabricatorMetaMTAController' => 'PhabricatorController',
+    'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
+    'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
+    'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
+    'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
     'PhabricatorPHID' => 'PhabricatorPHIDDAO',
     'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDController' => 'PhabricatorController',
     'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
     'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDType' => 'PhabricatorPHIDDAO',
     'PhabricatorPHIDTypeEditController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDTypeListController' => 'PhabricatorPHIDController',
     'PhabricatorPeopleController' => 'PhabricatorController',
     'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
     'PhabricatorStandardPageView' => 'AphrontPageView',
     'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
     'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
     'PhabricatorUser' => 'PhabricatorUserDAO',
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
   ),
   'requires_interface' =>
   array(
   ),
 ));
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index 900a8b320c..faf467307d 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -1,144 +1,150 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 /**
  * @group aphront
  */
 class AphrontDefaultApplicationConfiguration
   extends AphrontApplicationConfiguration {
 
   public function getApplicationName() {
     return 'aphront-default';
   }
 
   public function getURIMap() {
     return array(
       '/repository/' => array(
         '$'                     => 'RepositoryListController',
         'new/$'                 => 'RepositoryEditController',
         'edit/(?<id>\d+)/$'     => 'RepositoryEditController',
         'delete/(?<id>\d+)/$'   => 'RepositoryDeleteController',
       ),
       '/' => array(
         '$'                     => 'PhabricatorDirectoryMainController',
       ),
       '/directory/' => array(
         'item/$'
           => 'PhabricatorDirectoryItemListController',
         'item/edit/(?:(?<id>\d+)/)?$'
           => 'PhabricatorDirectoryItemEditController',
         'item/delete/(?<id>\d+)/'
           => 'PhabricatorDirectoryItemDeleteController',
         'category/$'
           => 'PhabricatorDirectoryCategoryListController',
         'category/edit/(?:(?<id>\d+)/)?$'
           => 'PhabricatorDirectoryCategoryEditController',
         'category/delete/(?<id>\d+)/'
           => 'PhabricatorDirectoryCategoryDeleteController',
       ),
       '/file/' => array(
         '$' => 'PhabricatorFileListController',
         'upload/$' => 'PhabricatorFileUploadController',
         '(?<view>info)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
         '(?<view>view)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
         '(?<view>download)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
       ),
       '/phid/' => array(
         '$' => 'PhabricatorPHIDListController',
         'type/$' => 'PhabricatorPHIDTypeListController',
         'type/edit/(?:(?<id>\d+)/)?$' => 'PhabricatorPHIDTypeEditController',
         'new/$' => 'PhabricatorPHIDAllocateController',
       ),
       '/people/' => array(
         '$' => 'PhabricatorPeopleListController',
         'edit/(?:(?<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
       ),
       '/p/(?<username>\w+)/$' => 'PhabricatorPeopleProfileController',
       '/conduit/' => array(
         '$' => 'PhabricatorConduitConsoleController',
         'method/(?<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
         'log/$' => 'PhabricatorConduitLogController',
       ),
       '/api/(?<method>[^/]+)$' => 'PhabricatorConduitAPIController',
 
       '/differential/' => array(
         '$' => 'DifferentialRevisionListController',
         'diff/(?<id>\d+)/$'       => 'DifferentialDiffViewController',
         'changeset/(?<id>\d+)/$'  => 'DifferentialChangesetViewController',
         'revision/edit/(?:(?<id>\d+)/)?$'
           => 'DifferentialRevisionEditController',
       ),
 
       '/res/' => array(
         '(?<hash>[a-f0-9]{8})/(?<path>.+\.(?:css|js))$'
           => 'CelerityResourceController',
       ),
 
       '/typeahead/' => array(
         'common/(?<type>\w+)/$'
           => 'PhabricatorTypeaheadCommonDatasourceController',
       ),
+
+      '/mail/' => array(
+        '$' => 'PhabricatorMetaMTAListController',
+        'send/$' => 'PhabricatorMetaMTASendController',
+        'view/(?<id>\d+)/$' => 'PhabricatorMetaMTAViewController',
+      )
     );
   }
 
   public function buildRequest() {
     $request = new AphrontRequest($this->getHost(), $this->getPath());
     $request->setRequestData($_GET + $_POST);
     return $request;
   }
 
   public function handleException(Exception $ex) {
 
     $class    = phutil_escape_html(get_class($ex));
     $message  = phutil_escape_html($ex->getMessage());
 
     $content =
       '<div class="aphront-unhandled-exception">'.
         '<h1>Unhandled Exception "'.$class.'": '.$message.'</h1>'.
         '<code>'.phutil_escape_html((string)$ex).'</code>'.
       '</div>';
 
     $view = new PhabricatorStandardPageView();
     $view->appendChild($content);
 
     $response = new AphrontWebpageResponse();
     $response->setContent($view->render());
 
     return $response;
   }
 
   public function willSendResponse(AphrontResponse $response) {
     $request = $this->getRequest();
     if ($response instanceof AphrontDialogResponse) {
       if (!$request->isAjax()) {
         $view = new PhabricatorStandardPageView();
         $view->appendChild(
           '<div style="padding: 2em 0;">'.
             $response->buildResponseString().
           '</div>');
         $response = new AphrontWebpageResponse();
         $response->setContent($view->render());
         return $response;
       }
     }
 
     return $response;
   }
 
 
 }
diff --git a/src/aphront/request/AphrontRequest.php b/src/aphront/request/AphrontRequest.php
index 6d04d61db9..3b8d3a3d86 100644
--- a/src/aphront/request/AphrontRequest.php
+++ b/src/aphront/request/AphrontRequest.php
@@ -1,91 +1,91 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 
 /**
  * @group aphront
  */
 class AphrontRequest {
 
   const TYPE_AJAX = '__ajax__';
   const TYPE_FORM = '__form__';
 
   private $host;
   private $path;
   private $requestData;
 
   final public function __construct($host, $path) {
     $this->host = $host;
     $this->path = $path;
   }
 
   final public function setRequestData(array $request_data) {
     $this->requestData = $request_data;
     return $this;
   }
 
   final public function getPath() {
     return $this->path;
   }
 
   final public function getHost() {
     return $this->host;
   }
 
   final public function getInt($name, $default = null) {
     if (isset($this->requestData[$name])) {
       return (int)$this->requestData[$name];
     } else {
       return $default;
     }
   }
 
   final public function getStr($name, $default = null) {
     if (isset($this->requestData[$name])) {
       return (string)$this->requestData[$name];
     } else {
       return $default;
     }
   }
 
-  final public function getArr($name, $default = null) {
+  final public function getArr($name, $default = array()) {
     if (isset($this->requestData[$name]) &&
         is_array($this->requestData[$name])) {
       return $this->requestData[$name];
     } else {
       return $default;
     }
   }
 
   final public function getExists($name) {
     return array_key_exists($name, $this->requestData);
   }
 
   final public function isHTTPPost() {
     return ($_SERVER['REQUEST_METHOD'] == 'POST');
   }
 
   final public function isAjax() {
     return $this->getExists(self::TYPE_AJAX);
   }
 
   final public function isFormPost() {
     return $this->getExists(self::TYPE_FORM) && $this->isHTTPPost();
   }
 
 }
diff --git a/src/applications/metamta/controller/base/PhabricatorMetaMTAController.php b/src/applications/metamta/controller/base/PhabricatorMetaMTAController.php
new file mode 100644
index 0000000000..aee09ab14d
--- /dev/null
+++ b/src/applications/metamta/controller/base/PhabricatorMetaMTAController.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorMetaMTAController extends PhabricatorController {
+
+  public function buildStandardPageResponse($view, array $data) {
+    $page = new PhabricatorStandardPageView();
+
+    $page->setApplicationName('MetaMTA');
+    $page->setBaseURI('/mail/');
+    $page->setTitle(idx($data, 'title'));
+    $page->setGlyph("@");
+    $page->appendChild($view);
+
+    $response = new AphrontWebpageResponse();
+    return $response->setContent($page->render());
+  }
+
+}
diff --git a/src/applications/metamta/controller/base/__init__.php b/src/applications/metamta/controller/base/__init__.php
new file mode 100644
index 0000000000..23abc13fab
--- /dev/null
+++ b/src/applications/metamta/controller/base/__init__.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/webpage');
+phutil_require_module('phabricator', 'applications/base/controller/base');
+phutil_require_module('phabricator', 'view/page/standard');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorMetaMTAController.php');
diff --git a/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php b/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
new file mode 100644
index 0000000000..6ab40a0eec
--- /dev/null
+++ b/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorMetaMTAListController extends PhabricatorMetaMTAController {
+
+  public function processRequest() {
+    $mails = id(new PhabricatorMetaMTAMail())->loadAllWhere(
+      '1 = 1 ORDER BY id DESC LIMIT 100');
+
+    $rows = array();
+    foreach ($mails as $mail) {
+      $rows[] = array(
+        $mail->getID(),
+      );
+    }
+
+    $table = new AphrontTableView($rows);
+    $table->setHeaders(
+      array(
+        'ID',
+      ));
+    $table->setColumnClasses(
+      array(
+        null,
+      ));
+
+    $panel = new AphrontPanelView();
+    $panel->appendChild($table);
+    $panel->setHeader('MetaMTA Messages');
+    $panel->setCreateButton('Send New Message', '/mail/send/');
+
+    return $this->buildStandardPageResponse(
+      $panel,
+      array(
+        'title' => 'MetaMTA',
+      ));
+  }
+}
diff --git a/src/applications/metamta/controller/list/__init__.php b/src/applications/metamta/controller/list/__init__.php
new file mode 100644
index 0000000000..520ca62a9d
--- /dev/null
+++ b/src/applications/metamta/controller/list/__init__.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/metamta/controller/base');
+phutil_require_module('phabricator', 'applications/metamta/storage/mail');
+phutil_require_module('phabricator', 'view/control/table');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorMetaMTAListController.php');
diff --git a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
new file mode 100644
index 0000000000..0749216b68
--- /dev/null
+++ b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorMetaMTASendController extends PhabricatorMetaMTAController {
+
+  public function processRequest() {
+
+    $request = $this->getRequest();
+
+    if ($request->isFormPost()) {
+      $mail = new PhabricatorMetaMTAMail();
+      $mail->addTos($request->getArr('to'));
+      $mail->addCCs($request->getArr('cc'));
+      $mail->setSubject($request->getStr('subject'));
+      $mail->setBody($request->getStr('body'));
+
+      // TODO!
+//      $mail->setFrom($request->getViewerContext()->getUserID());
+      $mail->setSimulatedFailureCount($request->getInt('failures'));
+      $mail->setIsHTML($request->getInt('html'));
+      $mail->save();
+      if ($request->getInt('immediately')) {
+        $mail->sendNow($force_send = true);
+      }
+
+      return id(new AphrontRedirectResponse())
+        ->setURI('/mail/view/'.$mail->getID().'/');
+    }
+
+    $failure_caption =
+      "Enter a number to simulate that many consecutive send failures before ".
+      "really attempting to deliver via the underlying MTA.";
+
+
+    $form = new AphrontFormView();
+    $form->setAction('/mail/send/');
+    $form
+      ->appendChild(
+        '<p class="aphront-form-instructions">This form will send a normal '.
+        'email using MetaMTA as a transport mechanism.</p>')
+      ->appendChild(
+        id(new AphrontFormTokenizerControl())
+          ->setLabel('To')
+          ->setName('to')
+          ->setDatasource('/typeahead/common/user/'))
+      ->appendChild(
+        id(new AphrontFormTokenizerControl())
+          ->setLabel('CC')
+          ->setName('cc')
+          ->setDatasource('/typeahead/common/user/'))
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel('Subject')
+          ->setName('subject'))
+      ->appendChild(
+        id(new AphrontFormTextAreaControl())
+          ->setLabel('Body')
+          ->setName('body'))
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel('Simulate Failures')
+          ->setName('failures')
+          ->setCaption($failure_caption))
+      ->appendChild(
+        id(new AphrontFormCheckboxControl())
+          ->setLabel('HTML')
+          ->addCheckbox('html', '1', 'Send as HTML email.'))
+      ->appendChild(
+        id(new AphrontFormCheckboxControl())
+          ->setLabel('Send Now')
+          ->addCheckbox(
+            'immediately',
+            '1',
+            'Send immediately, not via MetaMTA background script.'))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Send Mail'));
+
+    $panel = new AphrontPanelView();
+    $panel->setHeader('Send Email');
+    $panel->appendChild($form);
+    $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
+
+    return $this->buildStandardPageResponse(
+      $panel,
+      array(
+        'title' => 'Send Mail',
+      ));
+/*
+    return
+      <metamta:standard-page title="Send Email">
+        <tools:form width="wide" method="post" action={URI::getRequestURI()}>
+          <h1>Send Email</h1>
+          <tools:fieldset>
+            <tools:instructions>This form will send a normal email using MetaMTA
+            as a transport mechanism.</tools:instructions>
+            <tools:control type="text" label="To">
+              <tools:tokenizer name="to" datasource="mailable" />
+            </tools:control>
+            <tools:control type="text" label="CC">
+              <tools:tokenizer name="cc" datasource="mailable" />
+            </tools:control>
+            <tools:control type="text" label="Subject">
+              <input type="text" name="subject" />
+            </tools:control>
+            <tools:control type="textarea" label="Body">
+              <textarea name="body"></textarea>
+            </tools:control>
+            <tools:control type="text" label="Simulate Failures"
+              caption={$failure_caption}>
+              <input type="text" name="failures" />
+            </tools:control>
+            <tools:control type="checkbox" label="HTML">
+              <input type="checkbox" name="html" value="1" />
+              Send as HTML email.
+            </tools:control>
+            <tools:control type="checkbox" label="Send Now">
+              <input type="checkbox" name="immediately" value="1" />
+              Send immediately, not via MetaMTA daemon.
+            </tools:control>
+            <tools:control type="submit">
+              <button>Send Email</button>
+            </tools:control>
+          </tools:fieldset>
+        </tools:form>
+      </metamta:standard-page>;
+*/
+  }
+
+}
diff --git a/src/applications/metamta/controller/send/__init__.php b/src/applications/metamta/controller/send/__init__.php
new file mode 100644
index 0000000000..d606f64d0f
--- /dev/null
+++ b/src/applications/metamta/controller/send/__init__.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/redirect');
+phutil_require_module('phabricator', 'applications/metamta/controller/base');
+phutil_require_module('phabricator', 'applications/metamta/storage/mail');
+phutil_require_module('phabricator', 'view/form/base');
+phutil_require_module('phabricator', 'view/form/control/submit');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorMetaMTASendController.php');
diff --git a/src/applications/metamta/storage/base/PhabricatorMetaMTADAO.php b/src/applications/metamta/storage/base/PhabricatorMetaMTADAO.php
new file mode 100644
index 0000000000..d8fc80b604
--- /dev/null
+++ b/src/applications/metamta/storage/base/PhabricatorMetaMTADAO.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorMetaMTADAO extends PhabricatorLiskDAO {
+
+  public function getApplicationName() {
+    return 'metamta';
+  }
+
+}
diff --git a/src/applications/metamta/storage/base/__init__.php b/src/applications/metamta/storage/base/__init__.php
new file mode 100644
index 0000000000..52a80525bc
--- /dev/null
+++ b/src/applications/metamta/storage/base/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/base/storage/lisk');
+
+
+phutil_require_source('PhabricatorMetaMTADAO.php');
diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
new file mode 100644
index 0000000000..16fce25555
--- /dev/null
+++ b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
@@ -0,0 +1,218 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * See #394445 for an explanation of why this thing even exists.
+ */
+class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {
+
+  const STATUS_QUEUE = 'queued';
+  const STATUS_SENT  = 'sent';
+  const STATUS_FAIL  = 'fail';
+
+  const MAX_RETRIES   = 250;
+  const RETRY_DELAY   = 5;
+
+  protected $parameters;
+  protected $status;
+  protected $message;
+  protected $retryCount;
+  protected $nextRetry;
+  protected $relatedPHID;
+
+  public function __construct() {
+
+    $this->status     = self::STATUS_QUEUE;
+    $this->retryCount = 0;
+    $this->nextRetry  = time();
+    $this->parameters = array();
+
+    parent::__construct();
+  }
+
+  public function getConfiguration() {
+    return array(
+      self::CONFIG_SERIALIZATION => array(
+        'parameters'  => self::SERIALIZATION_JSON,
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  protected function setParam($param, $value) {
+    $this->parameters[$param] = $value;
+    return $this;
+  }
+
+  protected function getParam($param) {
+    return idx($this->parameters, $param);
+  }
+
+  public function getSubject() {
+    return $this->getParam('subject');
+  }
+
+  public function addTos(array $phids) {
+    $this->setParam('to', $phids);
+    return $this;
+  }
+
+  public function addCCs(array $phids) {
+    $this->setParam('cc', $phids);
+    return $this;
+  }
+
+  public function addHeader($name, $value) {
+    $this->parameters['headers'][$name] = $value;
+    return $this;
+  }
+
+  public function setFrom($from) {
+    $this->setParam('from', $from);
+    return $this;
+  }
+
+  public function setReplyTo($phid) {
+    $this->setParam('reply-to', $phid);
+    return $this;
+  }
+
+  public function setSubject($subject) {
+    $this->setParam('subject', $subject);
+    return $this;
+  }
+
+  public function setBody($body) {
+    $this->setParam('body', $body);
+    return $this;
+  }
+
+  public function setIsHTML($html) {
+    $this->setParam('is-html', $html);
+    return $this;
+  }
+
+  public function getSimulatedFailureCount() {
+    return nonempty($this->getParam('simulated-failures'), 0);
+  }
+
+  public function setSimulatedFailureCount($count) {
+    $this->setParam('simulated-failures', $count);
+    return $this;
+  }
+
+  public function sendNow($force_send = false) {
+
+/*
+    if (!$force_send) {
+      if ($this->getStatus() != self::STATUS_QUEUE) {
+        throw new Exception("Trying to send an already-sent mail!");
+      }
+
+      if (time() < $this->getNextRetry()) {
+        throw new Exception("Trying to send an email before next retry!");
+      }
+    }
+
+    require_module_lazy('intern/mailer');
+    try {
+      $mailer = new InternMailer();
+      foreach ($this->parameters as $key => $value) {
+        switch ($key) {
+          case 'from':
+            $mailer->setFrom($value);
+            break;
+          case 'reply-to':
+            $mailer->addReplyTo($value);
+            break;
+          case 'to':
+            $mailer->addTos($value);
+            break;
+          case 'cc':
+            $mailer->addCCs($value);
+            break;
+          case 'headers':
+            foreach ($value as $header_key => $header_value) {
+              $mailer->addHeader($header_key, $header_value);
+            }
+            break;
+          case 'body':
+            $mailer->setBody($value);
+            break;
+          case 'subject':
+            $mailer->setSubject($value);
+            break;
+          case 'is-html':
+            if ($value) {
+              $mailer->setIsHTML(true);
+            }
+            break;
+          default:
+            // Just discard.
+        }
+      }
+
+      $mailer->addHeader('X-Mail-Transport-Agent', 'MetaMTA');
+
+      if (!$mailer->hasValidRecipients()) {
+        throw new Exception("Permanent failure: no valid recipients.");
+      }
+    } catch (Exception $ex) {
+      $this->setStatus(self::STATUS_FAIL);
+      $this->setMessage($ex->getMessage());
+      $this->save();
+      return;
+    }
+
+    if ($this->getRetryCount() < $this->getSimulatedFailureCount()) {
+      $ok = false;
+      $error = 'Simulated failure.';
+    } else {
+      $ok = $mailer->send();
+      $error = $mailer->getError();
+    }
+*/
+    $error = null;
+    $ok = true;
+
+    if (!$ok) {
+      $this->setMessage($error);
+      if ($this->getRetryCount() > self::MAX_RETRIES) {
+        $this->setStatus(self::STATUS_FAIL);
+      } else {
+        $this->setRetryCount($this->getRetryCount() + 1);
+        $next_retry = time() + ($this->getRetryCount() * self::RETRY_DELAY);
+        $this->setNextRetry($next_retry);
+      }
+    } else {
+      $this->setStatus(self::STATUS_SENT);
+    }
+
+    $this->save();
+  }
+
+  public static function getReadableStatus($status_code) {
+    static $readable = array(
+      self::STATUS_QUEUE => "Queued for Delivery",
+      self::STATUS_FAIL  => "Delivery Failed",
+      self::STATUS_SENT  => "Sent",
+    );
+    $status_code = coalesce($status_code, '?');
+    return idx($readable, $status_code, $status_code);
+  }
+
+}
diff --git a/src/applications/metamta/storage/mail/__init__.php b/src/applications/metamta/storage/mail/__init__.php
new file mode 100644
index 0000000000..43e0257082
--- /dev/null
+++ b/src/applications/metamta/storage/mail/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/metamta/storage/base');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorMetaMTAMail.php');
diff --git a/src/view/form/control/base/AphrontFormControl.php b/src/view/form/control/base/AphrontFormControl.php
index 1f078710f8..b5c93fd814 100755
--- a/src/view/form/control/base/AphrontFormControl.php
+++ b/src/view/form/control/base/AphrontFormControl.php
@@ -1,137 +1,137 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 abstract class AphrontFormControl extends AphrontView {
 
   private $label;
   private $caption;
   private $error;
   private $name;
   private $value;
   private $disabled;
 
   public function setLabel($label) {
     $this->label = $label;
     return $this;
   }
 
   public function getLabel() {
     return $this->label;
   }
 
   public function setCaption($caption) {
     $this->caption = $caption;
     return $this;
   }
 
   public function getCaption() {
     return $this->caption;
   }
 
   public function setError($error) {
     $this->error = $error;
     return $this;
   }
 
   public function getError() {
     return $this->error;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
   public function setValue($value) {
     $this->value = $value;
     return $this;
   }
 
   public function getValue() {
     return $this->value;
   }
 
   public function setDisabled($disabled) {
     $this->disabled = $disabled;
     return $this;
   }
 
   public function getDisabled() {
     return $this->disabled;
   }
 
   abstract protected function renderInput();
   abstract protected function getCustomControlClass();
 
   final public function render() {
     $custom_class = $this->getCustomControlClass();
 
     if (strlen($this->getLabel())) {
       $label =
-        '<label>'.
+        '<label class="aphront-form-label">'.
           phutil_escape_html($this->getLabel()).
           ':'.
         '</label>';
     } else {
       $label = null;
       $custom_class .= ' aphront-form-control-nolabel';
     }
 
     $input =
       '<div class="aphront-form-input">'.
         $this->renderInput().
       '</div>';
 
     if (strlen($this->getError())) {
       $error = $this->getError();
       if ($error === true) {
         $error = '*';
       } else {
         $error = "\xC2\xAB ".$error;
       }
       $error =
         '<div class="aphront-form-error">'.
           phutil_escape_html($error).
         '</div>';
     } else {
       $error = null;
     }
 
     if (strlen($this->getCaption())) {
       $caption =
         '<div class="aphront-form-caption">'.
           phutil_escape_html($this->getCaption()).
         '</div>';
     } else {
       $caption = null;
     }
 
     return
       '<div class="aphront-form-control '.$custom_class.'">'.
         $error.
         $label.
         $input.
         $caption.
         '<div style="clear: both;"></div>'.
       '</div>';
   }
 }
diff --git a/src/view/form/control/checkbox/AphrontFormCheckboxControl.php b/src/view/form/control/checkbox/AphrontFormCheckboxControl.php
new file mode 100755
index 0000000000..8203a2ce80
--- /dev/null
+++ b/src/view/form/control/checkbox/AphrontFormCheckboxControl.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class AphrontFormCheckboxControl extends AphrontFormControl {
+
+  private $boxes = array();
+
+  public function addCheckbox($name, $value, $label, $checked = false) {
+    $this->boxes[] = array(
+      'name'    => $name,
+      'value'   => $value,
+      'label'   => $label,
+      'checked' => $checked,
+    );
+    return $this;
+  }
+
+  protected function getCustomControlClass() {
+    return 'aphront-form-control-checkbox';
+  }
+
+  protected function renderInput() {
+    $rows = array();
+    foreach ($this->boxes as $box) {
+      $id = celerity_generate_unique_node_id();
+      $checkbox = phutil_render_tag(
+        'input',
+        array(
+          'id' => $id,
+          'type' => 'checkbox',
+          'name' => $box['name'],
+          'value' => $box['value'],
+          'checked' => $box['checked'] ? 'checked' : null,
+        ));
+      $label = phutil_render_tag(
+        'label',
+        array(
+          'for' => $id,
+        ),
+        phutil_escape_html($box['label']));
+      $rows[] =
+        '<tr>'.
+          '<td>'.$checkbox.'</td>'.
+          '<th>'.$label.'</th>'.
+        '</tr>';
+    }
+    return
+      '<table class="aphront-form-control-checkbox-layout">'.
+        implode("\n", $rows).
+      '</table>';
+  }
+
+}
diff --git a/src/view/form/control/checkbox/__init__.php b/src/view/form/control/checkbox/__init__.php
new file mode 100644
index 0000000000..612300678f
--- /dev/null
+++ b/src/view/form/control/checkbox/__init__.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'infratructure/celerity/api');
+phutil_require_module('phabricator', 'view/form/control/base');
+
+phutil_require_module('phutil', 'markup');
+
+
+phutil_require_source('AphrontFormCheckboxControl.php');
diff --git a/webroot/rsrc/css/aphront/form-view.css b/webroot/rsrc/css/aphront/form-view.css
index 03edd372da..fdf79ef46b 100644
--- a/webroot/rsrc/css/aphront/form-view.css
+++ b/webroot/rsrc/css/aphront/form-view.css
@@ -1,85 +1,99 @@
 /**
  * @provides aphront-form-view-css
  */
 
 .aphront-form-view {
   background: #e7e7e7;
   border: 1px solid #c4c4c4;
   padding: 1em;
 }
 
-.aphront-form-view label {
+.aphront-form-view label.aphront-form-label {
   padding-top: 4px;
   width: 19%;
   float: left;
   text-align: right;
   font-weight: bold;
   font-size: 13px;
   color: #666666;
 }
 
 .aphront-form-input {
   margin-left: 20%;
   margin-right: 25%;
   width: 55%;
 }
 
 .aphront-form-error {
   width: 23%;
   float: right;
   color: #aa0000;
   font-weight: bold;
   padding-top: 4px;
 }
 
 .aphront-form-input input,
 .aphront-form-input textarea {
   font-size: 12px;
   width: 100%;
 }
 
 
 .aphront-form-input textarea {
   height: 12em;
 }
 
 .aphront-form-control {
   padding: 4px;
 }
 
 .aphront-form-control-submit button,
 .aphront-form-control-submit a.button {
   float: right;
   margin: 0.5em 0 0em 2%;
 }
 
 .aphront-form-control-select .aphront-form-input {
   padding-top: 2px;
 }
 
 
 .aphront-form-view .aphront-form-caption {
   font-size: 11px;
   color: #444444;
   text-align: right;
   clear: both;
   margin-right: 25%;
-  margin-left: 15%;
+  margin-left: 20%;
 }
 
 .aphront-error-view {
   width: 720px;
   margin: 1em auto;
   border: 1px solid #aa0000;
   padding: 1em;
   background: #f9b9bc;
 }
 
 .aphront-form-instructions {
-  margin: 2em 3%;
+  margin: 0.75em 3% 1.25em;
 }
 
 .aphront-form-control-static .aphront-form-input {
   padding-top: 4px;
   font-size: 13px;
 }
+
+table.aphront-form-control-checkbox-layout {
+  margin-top: 3px;
+  font-size: 13px;
+}
+
+table.aphront-form-control-checkbox-layout th {
+  padding-top: 2px;
+  padding-left: 0.35em;
+}
+
+.aphront-form-control-checkbox-layout td input {
+  width: auto;
+}