diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index 1c3c71f305..bf6f315f3a 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -55,8 +55,8 @@ foreach (array('text', 'html') as $part) {
 }
 
 $headers = $parser->getHeaders();
-$headers['subject'] = iconv_mime_decode($headers['subject'], 0, 'UTF-8');
-$headers['from'] = iconv_mime_decode($headers['from'], 0, 'UTF-8');
+$headers['subject'] = phutil_decode_mime_header($headers['subject']);
+$headers['from'] = phutil_decode_mime_header($headers['from']);
 
 if ($args->getArg('process-duplicates')) {
   $headers['message-id'] = Filesystem::readRandomCharacters(64);
diff --git a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
index 973c80629b..51105de1c5 100644
--- a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
@@ -11,14 +11,13 @@ final class PhabricatorExtensionsSetupCheck extends PhabricatorSetupCheck {
   }
 
   protected function executeChecks() {
-    // TODO: Make 'mbstring' and 'iconv' soft requirements.
+    // TODO: Make 'mbstring' a soft requirement.
 
     $required = array(
       'hash',
       'json',
       'openssl',
       'mbstring',
-      'iconv',
       'ctype',
 
       // There is a tiny chance we might not need this, but a significant
diff --git a/src/applications/config/controller/PhabricatorConfigVersionController.php b/src/applications/config/controller/PhabricatorConfigVersionController.php
index 8a87dec5cc..a9571a1f85 100644
--- a/src/applications/config/controller/PhabricatorConfigVersionController.php
+++ b/src/applications/config/controller/PhabricatorConfigVersionController.php
@@ -63,6 +63,8 @@ final class PhabricatorConfigVersionController
         $version_from_file);
     }
 
+    $version_property_list->addProperty('php', phpversion());
+
     $binaries = PhutilBinaryAnalyzer::getAllBinaries();
     foreach ($binaries as $binary) {
       if (!$binary->isBinaryAvailable()) {