Enhancement to the message forwarding without quoting plus other fixed, thanks DrKLO