Refactor Message#from