Make Message#message return a Mail object, not raw source