Politeness is the key to anger,If he mess you up today, never mind him or her today.Sit up with him to have a drink or coffee then you have the chance to tell him in plain words that this and this you did to I really hate it so never repeat it again and again.
Country_angel_