Fixes for email threading