Merge "Add message flags for "replied to" and "forwarded""