We have to think about the way we can store the white list. We have some cases that a domain might have many message-ids, this is the case of google services. 
What about opening an issue discussion for this ?