Page MenuHomePhabricator
Files F15449860

D9716.id23330.diff
No OneTemporary
Actions

D9716.id23330.diff
View Options

diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -102,8 +102,12 @@
$re_prefix_description = $this->deformat(pht(<<<EODOC
Mail.app on OS X Lion won't respect threading headers unless the subject is
-prefixed with "Re:". If you enable this option, Phabricator will add "Re:" to
-the subject line of all mail which is expected to thread. If you've set
+prefixed with "Re:". Phabricator adds the "Re:" prefix automatically for
+follow-up messages, and it typically "Just works".\n
+However, if your email adapter does not support the Message-ID email header
+(Amazon SNS & Sendgrid), then messages will not be threaded together unless
+every single message, including the first one, is prefixed with "Re: ". This
+option allows you to force this behavior. If you've set
'metamta.one-mail-per-recipient', users can override this setting in their
preferences.
EODOC
@@ -268,10 +272,10 @@
$this->newOption('metamta.re-prefix', 'bool', false)
->setBoolOptions(
array(
- pht('Force "Re:" Subject Prefix'),
- pht('No "Re:" Subject Prefix'),
+ pht('Force "Re:" Subject Prefix on all outgoing emails'),
+ pht('Add "Re:" Subject Prefix when needed'),
))
- ->setSummary(pht('Control "Re:" subject prefix, for Mail.app.'))
+ ->setSummary(pht('Control "Re:" subject prefix for Mail.app.'))
->setDescription($re_prefix_description),
$this->newOption('metamta.vary-subjects', 'bool', true)
->setBoolOptions(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -464,15 +464,15 @@
$subject = array();
if ($is_threaded) {
- $add_re = PhabricatorEnv::getEnvConfig('metamta.re-prefix');
+ $force_add_re = PhabricatorEnv::getEnvConfig('metamta.re-prefix');
if ($prefs) {
- $add_re = $prefs->getPreference(
+ $force_add_re = $prefs->getPreference(
PhabricatorUserPreferences::PREFERENCE_RE_PREFIX,
- $add_re);
+ $force_add_re);
}
- if ($add_re) {
+ if ($force_add_re || !$is_first) {
$subject[] = 'Re:';
}
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 29, 12:32 PM (4 d, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223395
Default Alt Text
D9716.id23330.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility