Save message bug fixed. Closed #838