renamed Mail to Message