SIO-1191 Change message form

Change-Id: I7aad66f27b1366a970f42ab8adcac3f4dd5f50a6