Merge pull request #942 from ermshiperete/MessageBoxBugs