simplify the Messages service slightly