better handling of original message