Fix replies to deeply nested and/or encrpyted messages.

This isn't the full fix, but it's a workable solution for the
moment. Need to discuss this in depth with Marc.