Move message movement into message