Fixed issue with forward message

Merged Sylvain Berfini requested to merge fix/forward into master

Merge request reports