improve message listing message and flow