merged gateway into Message.new