Merge pull request #1139 from Diapolo/messagepage