Messages Save functionality bug