ticket:6 Fix show "sending message"

Error occurred when the form is saved more than once
Merge branch 't6_bug_fix'