unify message code in controller

inconsistent change in f296ff1
Merge pull request #18 from mauk81/patch-1

unify message code in controller