further cleanup
oops, don't access db every message part no. 2