diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h
index 26673f9..0789cd9 100644
--- a/ReplyWithHeader/MHConstants.h
+++ b/ReplyWithHeader/MHConstants.h
@@ -57,6 +57,8 @@
#define MHHeaderLabelMode @"MHHeaderLabelMode"
#define MHHeaderOrderMode @"MHHeaderOrderMode"
+#define MHHeaderAttributionFromTagStyle @"MHHeaderAttributionFromTagStyle"
+
#define MHPluginNotifyNewVersion @"MHNotifyPluginNewVersion"
#define MHSubjectPrefixTextEnabled @"MHSubjectPrefixTextEnabled"
#define MHBundleHeaderLanguageCode @"MHBundleHeaderLanguageCode"
diff --git a/ReplyWithHeader/MHHeaderString.m b/ReplyWithHeader/MHHeaderString.m
index ebda910..51845a5 100644
--- a/ReplyWithHeader/MHHeaderString.m
+++ b/ReplyWithHeader/MHHeaderString.m
@@ -302,7 +302,11 @@ - (void)applyHeaderLabelChange
range = [[row string] rangeOfString:@":"];
NSString *fromString = [[row string] substringFromIndex:range.location + 2];
- fromString = [self getFullNameFromEmailAddress:fromString isMailToNeeded:TRUE];
+ NSInteger fromTagStyle = GET_DEFAULT_INT(MHHeaderAttributionFromTagStyle);
+ BOOL mailToNeeded = FALSE;
+
+ if (fromTagStyle == 1) mailToNeeded = TRUE;
+ fromString = [self getFullNameFromEmailAddress:fromString isMailToNeeded:mailToNeeded];
[row replaceCharactersInRange:NSMakeRange(range.location + 2, [row length] - (range.location + 2)) withString:fromString];
}
diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m
index 5d72a3f..69f1b0d 100644
--- a/ReplyWithHeader/MailHeader.m
+++ b/ReplyWithHeader/MailHeader.m
@@ -197,6 +197,7 @@ + (void)assignUserDefaults
[NSNumber numberWithBool:NO], MHRemoveSignatureEnabled,
[NSNumber numberWithInt:2], MHHeaderLabelMode,
[NSNumber numberWithInt:2], MHHeaderOrderMode,
+ [NSNumber numberWithInt:0], MHHeaderAttributionFromTagStyle,
[NSNumber numberWithBool:NO], MHLogEnabled,
nil
];
diff --git a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
index a88fa6b..653fa54 100644
--- a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
+++ b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
@@ -99,6 +99,7 @@
{{11, 9}, {566, 407}}
+
{{10, 33}, {546, 361}}
-
+
Manage Headers
@@ -627,10 +906,7 @@
6
System
textBackgroundColor
-
- 3
- MQA
-
+
3
@@ -647,7 +923,6 @@
268
{{14, 17}, {518, 22}}
-
YES
67108864
@@ -853,15 +1128,12 @@
{{454, 405}, {119, 25}}
+
YES
RtI-Hc-LYI
+
+
+ selectedTag: values.MHHeaderAttributionFromTagStyle
+
+
+
+
+
+ selectedTag: values.MHHeaderAttributionFromTagStyle
+ selectedTag
+ values.MHHeaderAttributionFromTagStyle
+ 2
+
+
+ LmJ-vR-Zt5
+
@@ -1443,6 +1731,8 @@
+
+
@@ -1844,6 +2134,44 @@
+
+ uhJ-rc-zld
+
+
+
+
+
+
+
+ 952-It-eIl
+
+
+
+
+
+
+
+
+
+ zVR-s0-P4b
+
+
+
+
+ jmN-T5-LTm
+
+
+
+
+ E8s-S7-RGq
+
+
+
+
+ fnc-nZ-KKl
+
+
+
@@ -2058,6 +2386,8 @@
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2071,8 +2401,12 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin