MMS Export Missing Addresses

[j4w3]

It seems like MMS messages from a single sender to a single recipient (i.e. a conversation with just two people) are not exporting correctly for me. Comparing against the XML file of normal non-Signal MMS message that are exported normally out of SMS Backup, it appears as if the Signal MMS message is missing the sender address in the XML file.

Lines 218-221 never seem to run and it doesn't look like an XML line of type_address = 137 ever gets generated for MMS messages somewhere between lines 218-221

Trying to dig into the code, it looks like there may be something wrong with the addresses that are being fetched in the first place with these types of MMS messages (somewhere between lines 395-431)?

No error when running in command line, just plentiful errors when importing from Signal into normal text messages. Android version 6.31.2.