fixes #133: check message limit on change
Merge pull request #135 from ablasdel/issue_133

fixes #133: check message limit on change