Fix for User message and forwarded message getting merged.
Merge branch 'stable' of https://github.com/Knotable/mailfriend into stable