Added checks for NULL values when creating reply/forward headers
Fixes for embedded messages and headers