Paul resolved issue with In-Reply-To and References headers not being
retained on reply (#1810659). Minor adjustment to patch to fix an
undefined var issue.

Additional fix for missing variable in Message class.