don't introduce date instance variable wich is only used in #message, pass it as param
merge with master