Imporved code for expanding forwarded message
Add condition for the forwarded message