Do not save message twice [#48]