Prevent trouble with the None case - we need to reorg this so that we can pull messages from a list which works across apps / custom