Fixed server message page display issues identified in issue #1107.
Merge branch 'v3.0' of github.com:wet-boew/wet-boew into v3.0