Okay, it's called 'Conversation View' and in Google Mail it's the VERY LAST thing in settings. In Outlook it's under 'View' and it says 'Show in Conversations'

I think you jinxed me because all of a sudden mine were threaded into conversations as well ... both in outlook and google mail!!