Refactor the `extract_contents_message` function

[ericapisani]

This function is overly complex and is difficult to follow, especially given all the possible permutations that can be passed in as content. This has led to edge cases

Recommend addressing this before tackling something like PY-2289

[linear-code]

PY-2290