remove old comment
add configurable message subject