AddMessages() improved