Merging v4.6 branch to master for release

Package/Install-or-Upgrade-or-Reenable.command

@@ -73,7 +73,8 @@ mh_mail_app_uuid=$(defaults read /Applications/Mail.app/Contents/Info.plist Plug
     fi
 fi
 
-mh_ver_chk=$(echo "${mh_mac_osx_version} < 10.9" | bc)
+# for issue #66 - Version check condition updated
+mh_ver_chk=$(echo "${mh_mac_osx_version} == 10.7 || ${mh_mac_osx_version} == 10.8" | bc)
 if [ ${mh_ver_chk} -eq 1 ]; then
 if [ -f /System/Library/Frameworks/Message.framework/Resources/Info.plist ]; then
 mh_msg_frwk_uuid=$(defaults read /System/Library/Frameworks/Message.framework/Resources/Info.plist PluginCompatibilityUUID)

README.md

@@ -4,16 +4,14 @@ Quoting Headers and Signatures in Mail.app
 
 * [Home page][2]
 * [Download Latest Release - MacUpdate.com][5]
-* [Issue Tracker](#issue-tracker)
-* [How to Install](#how-to-install)
-* [Author](#author)
-* [Credits](#credits)
-* [License][4]
+* [Reporting Issues](#reporting-issues)
+* [Installation](#installation)
+* [FAQ][7]
 
 * * *
 
-How to Install
---------------
+Installation
+------------
 
 * Double click the file `Install-or-Upgrade-or-Reenable.command` from downloaded `ReplyWithHeader-vX.X.zip`
 <pre><code>RWH:: Mac OS X version: 10.X
@@ -23,16 +21,20 @@ RWH:: Installing ReplyWithHeader Mail plugin
 RWH:: user 'name' is installing plugin
 RWH:: Enabling plugin support in Mail.app
 RWH:: Domain is /Users/&lt;username>/Library/Containers/com.apple.mail/Data/Library/Preferences/com.apple.mail.plist
-RWH:: Adding UUID <Respective UUID value>
+RWH:: Adding UUID &lt;Respective UUID value>
 RWH:: Installation complete
 ===================================================
   Plugin installation completed, restart Mail.app  
 ===================================================</code></pre>
 * Restart Mail.app
 
-Issue Tracker
--------------
-Please submit any bugs or annoyances [here][3]
+Reporting Issues
+----------------
+ReplyWithHeader uses [GitHub’s integrated issue tracking system][3] to record bugs and feature requests. If you want to raise an issue, please follow the recommendations bellow:
+
+* Before you log a bug, please search the issue tracker to see if someone has already reported the problem. If the issue doesn’t already exist, create a new issue.
+* Please provide as much information as possible with the issue report, we like to know the version of ReplyWithHeader that you are using.
+* If you need to paste code, or include a stack trace use Markdown ``` escapes before and after your text.
 
 Author
 ------
@@ -44,10 +46,15 @@ Credits
 * 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).
 
+License
+-------
+ReplyWithHeader is released under [MIT License][4]
+
 
 [1]: http://myjeeva.com
 [2]: http://myjeeva.com/replywithheader
 [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
+[7]: http://myjeeva.com/replywithheader#faq

ReplyWithHeader.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		13B6E5D717F6F41E00878012 /* MHHeadersEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B6E5D617F6F41E00878012 /* MHHeadersEditor.m */; };
 		13E929FB1800CB1100AAE5CE /* MailHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E929FA1800CB1000AAE5CE /* MailHeader.m */; };
 		9C27AEB81932CF540007486F /* MHSignature.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C27AEB71932CF540007486F /* MHSignature.m */; };
+		9C3230E619BD578200757AA4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 9C3230E519BD578200757AA4 /* Credits.rtf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -121,6 +122,7 @@
 		9C27AEB4193160990007486F /* Signature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Signature.h; sourceTree = "<group>"; };
 		9C27AEB61932CF540007486F /* MHSignature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MHSignature.h; sourceTree = "<group>"; };
 		9C27AEB71932CF540007486F /* MHSignature.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MHSignature.m; sourceTree = "<group>"; };
+		9C3230E519BD578200757AA4 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -224,6 +226,7 @@
 				13A25F4617F9CE90002394DF /* Entitlements.plist */,
 				1365843B17FAC12700E8C57D /* MailHeader.strings */,
 				138BAEBF182022AA00738ADB /* Config.plist */,
+				9C3230E519BD578200757AA4 /* Credits.rtf */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -381,6 +384,7 @@
 				1372350F17FD8316007E7B71 /* MHPreferencesView.xib in Resources */,
 				132C66631827E23400CD7C1A /* language.png in Resources */,
 				138BAEBD182022AA00738ADB /* Config.plist in Resources */,
+				9C3230E619BD578200757AA4 /* Credits.rtf in Resources */,
 				1372351517FD8F3D007E7B71 /* MHPreferencesView.strings in Resources */,
 				13882A3018073509004BCC6D /* LICENSE.txt in Resources */,
 			);

ReplyWithHeader/MHConstants.h

@@ -44,7 +44,7 @@
 #define MHTypographyEnabled @"MHHeaderTypographyEnabled"
 #define MHHeaderOptionEnabled @"MHHeaderLabelOptionEnabled"
 #define MHRemoveSignatureEnabled @"MHRemoveSignatureEnabled"
-#define MHDefaulReplyHeaderBorder @"<br />---------- Original Message ----------<br />"
+#define MHDefaulReplyHeaderBorder @"---------- Original Message ----------<br />"
 #define MHDefaultForwardHeaderBorder @"---------- Forwarded Message ----------<br />"
 #define MHHeaderBorder @"<hr style='border:none;border-top:solid #B5C4DF 1.0pt;padding:0 0 0 0;margin:10px 0 5px 0;' />"
 #define MHDefaultHeaderFontName @"Tahoma"

ReplyWithHeader/MHQuotedMailOriginal.h

@@ -43,6 +43,7 @@
     int textNodeLocation; //which
     DOMNodeList *dhc; //document header children
     int msgComposeType;
+    BOOL isBlockquotePresent;
 }
 
 - (id)initWithMailMessage:(id)mailMessage msgComposeType:(int)composeType;