(Internal) Email reply tracking bugs