Simplify "messages" method

@maxfliri
@pbadenski