diff --git a/README.md b/README.md
index 54c6e3e..614ced6 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
Quoting reply and forward headers of email in Mail.app
------------------------------------------------------
-[ReplyWithHeader][2] plugin enables Apple Mail.app to represent meaningful reply and forward headers and blends with corporate world email communication.
+[ReplyWithHeader][2] is an Apple Mail bundle/plugin that enables quoting of the email message header in a reply and forward email message. It brings Outlook Mail Header capabilities to Apple Mail and adds missing functionality of headers to Mail.app. Blends with corporate world email communication.
-* [Plugin Homepage][2]
+* [Plugin page - Features, supported version, etc][2]
* [Download Latest Release - MacUpdate.com][5]
* [Issue Tracker](#issue-tracker)
* [How to Install](#how-to-install)
@@ -40,12 +40,14 @@ Jeevanandam M. (jeeva@myjeeva.com)
Credits
-------
+* Since v3.5, [Jeevanandam M.][6] have taken over the project to make wonderful :)
* Jason Schroth (jschroth) extended his helping hands towards maintaining [ReplyWithHeader][2] mail bundle from Aug 9th, 2012 to Sep 16, 2013
* Saptarshi Guha (saptarshiguha) initially started [ReplyWithHeader][2] mail bundle development for Apple Mail Application on Oct 22nd, 2010. He handed over the project to Jason Schroth (jschroth).
[1]: http://myjeeva.com
[2]: http://myjeeva.com/replywithheader
-[3]: https://github.com/jeevatkm/ReplyWithHeaders/issues
-[4]: https://github.com/jeevatkm/ReplyWithHeaders/blob/master/ReplyWithHeader/LICENSE.txt
+[3]: https://github.com/jeevatkm/ReplyWithHeader/issues
+[4]: https://github.com/jeevatkm/ReplyWithHeader/blob/master/ReplyWithHeader/LICENSE.txt
[5]: https://www.macupdate.com/app/mac/49256/replywithheader
+[6]: https://github.com/jeevatkm
diff --git a/ReplyWithHeader/MHConstants.h b/ReplyWithHeader/MHConstants.h
index f9e255a..0789cd9 100644
--- a/ReplyWithHeader/MHConstants.h
+++ b/ReplyWithHeader/MHConstants.h
@@ -44,7 +44,6 @@
#define MHTypographyEnabled @"MHHeaderTypographyEnabled"
#define MHHeaderOptionEnabled @"MHHeaderLabelOptionEnabled"
#define MHRemoveSignatureEnabled @"MHRemoveSignatureEnabled"
-#define MHEntourage2004SupportEnabled @"MHEntourage2004SupportEnabled"
#define MHDefaulReplyHeaderBorder @"
---------- Original Message ----------
"
#define MHDefaultForwardHeaderBorder @"---------- Forwarded Message ----------
"
#define MHHeaderBorder @"
"
@@ -58,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/MHPreferences.h b/ReplyWithHeader/MHPreferences.h
index 3b99e54..f01a718 100644
--- a/ReplyWithHeader/MHPreferences.h
+++ b/ReplyWithHeader/MHPreferences.h
@@ -41,7 +41,6 @@
IBOutlet NSButton *_MHBundleEnabled;
IBOutlet NSButton *_MHForwardHeaderEnabled;
IBOutlet NSButton *_MHHeaderTypographyEnabled;
- IBOutlet NSButton *_MHEntourage2004SupportEnabled;
IBOutlet NSButton *_MHSelectFont;
IBOutlet NSButton *_MHHeaderOptionEnabled;
IBOutlet NSButton *_MHNotifyNewVersion;
diff --git a/ReplyWithHeader/MHPreferences.m b/ReplyWithHeader/MHPreferences.m
index 42b0d6e..e5cead1 100644
--- a/ReplyWithHeader/MHPreferences.m
+++ b/ReplyWithHeader/MHPreferences.m
@@ -48,7 +48,6 @@ - (void)toggleMailPreferencesOptions:(BOOL *)state
[_MHHeaderTypographyEnabled setEnabled:state];
[_MHForwardHeaderEnabled setEnabled:state];
[_MHHeaderOptionEnabled setEnabled:state];
- [_MHEntourage2004SupportEnabled setEnabled:state];
[_MHNotifyNewVersion setEnabled:state];
[_MHSubjectPrefixTextEnabled setEnabled:state];
[_MHRemoveSignatureEnabled setEnabled:state];
diff --git a/ReplyWithHeader/MHQuotedMailOriginal.m b/ReplyWithHeader/MHQuotedMailOriginal.m
index 94f634d..a61919c 100644
--- a/ReplyWithHeader/MHQuotedMailOriginal.m
+++ b/ReplyWithHeader/MHQuotedMailOriginal.m
@@ -133,12 +133,6 @@ - (void)insertMailHeader:(MHHeaderString *)mailHeader
MHLog(@"Header HTML %@", [[headerFragment firstChild] outerHTML]);
- // Entourage 2004 text size transformations
- if (GET_DEFAULT_BOOL(MHEntourage2004SupportEnabled))
- {
- [self applyEntourage2004Support:headerFragment];
- }
-
if (msgComposeType == 1 || msgComposeType == 2 || (manageForwardHeader && msgComposeType == 3))
{
if ( isHTMLMail )
@@ -368,7 +362,8 @@ - (void)prepareQuotedPlainText
}
}
-- (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment
+// issue #42
+/*- (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment
{
// kind of silly, but this code is required so that the adulation appears correctly
// in Entourage 2004 would interpret the paragraph tag and ignore
@@ -424,7 +419,7 @@ - (void)applyEntourage2004Support:(DOMDocumentFragment *) headerFragment
[[headerFragment firstChild] replaceChild:brelem oldChild:[fragmentNodes item:i] ];
}
}
-}
+} */
- (DOMDocumentFragment *)createDocumentFragment:(NSString *)htmlString
{
diff --git a/ReplyWithHeader/MailHeader.m b/ReplyWithHeader/MailHeader.m
index e11df0e..69f1b0d 100644
--- a/ReplyWithHeader/MailHeader.m
+++ b/ReplyWithHeader/MailHeader.m
@@ -193,11 +193,11 @@ + (void)assignUserDefaults
MHDefaultHeaderFontName, MHHeaderFontName,
MHDefaultHeaderFontSize, MHHeaderFontSize,
[NSArchiver archivedDataWithRootObject:[NSColor blackColor]], MHHeaderColor,
- [NSNumber numberWithBool:NO], MHEntourage2004SupportEnabled,
[NSNumber numberWithBool:YES], MHSubjectPrefixTextEnabled,
[NSNumber numberWithBool:NO], MHRemoveSignatureEnabled,
[NSNumber numberWithInt:2], MHHeaderLabelMode,
[NSNumber numberWithInt:2], MHHeaderOrderMode,
+ [NSNumber numberWithInt:0], MHHeaderAttributionFromTagStyle,
[NSNumber numberWithBool:NO], MHLogEnabled,
nil
];
@@ -229,7 +229,7 @@ + (void)smoothValueTransToNewMailPrefUI
if (GET_DEFAULT_BOOL(@"entourage2004Support"))
{
- SET_DEFAULT_BOOL(GET_DEFAULT_BOOL(@"entourage2004Support"), MHEntourage2004SupportEnabled);
+ SET_DEFAULT_BOOL(GET_DEFAULT_BOOL(@"entourage2004Support"), @"MHEntourage2004SupportEnabled");
REMOVE_DEFAULT(@"entourage2004Support");
}
@@ -255,6 +255,12 @@ + (void)smoothValueTransToNewMailPrefUI
REMOVE_DEFAULT(@"RwhReplyHeaderText");
}
// [end]
+
+ // issue #42
+ if (GET_DEFAULT(@"MHEntourage2004SupportEnabled"))
+ {
+ REMOVE_DEFAULT(@"MHEntourage2004SupportEnabled");
+ }
}
diff --git a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
index dc801b8..653fa54 100644
--- a/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
+++ b/ReplyWithHeader/Resources/en.lproj/MHPreferencesView.xib
@@ -2,10 +2,10 @@
1070
- 13A603
+ 13B42
4514
1265
- 695.00
+ 696.00
Manage Headers
@@ -676,10 +906,7 @@
6
System
textBackgroundColor
-
+
@@ -1957,11 +2184,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
com.apple.InterfaceBuilder.CocoaPlugin
@@ -1988,11 +2210,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2169,6 +2386,8 @@
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2243,7 +2466,6 @@
NSButton
NSTabView
NSColorWell
- NSButton
NSButton
NSTextField
NSMatrix
@@ -2269,10 +2491,6 @@
_MHColorWell
NSColorWell
-