More tweaks to thread fields
Merge branch 'enhanced-flowdock-notifier' into flowdock