Message icons were lost on editing - quick fix of #1820 better handling needed in the future I think

Signed-off-by: emanuele <emanuele45@gmail.com>