[RVM] mail_message modifications