Merge "Added "replied to" and "forwarded" icons in message list"