Merge "Send a uri for extra_in_reference_to_message_uri" into jb-ub-mail