Done messages polish