fixing addmessages and device image