fix for email threading, partially addresses #292