Formatting threads
Merge branch 'mailThreading' into testing