Handle old messages too