Update and rename message to Andrea to message with Andrea

sorry for the slow work btw... nobody should see this yet.