problem sending epubs to Kindle

Kindle has supposedly stopped allowing mobi files to be emailed to kindles as documents, but I have tried sending epubs, and lots the punctuation marks are completely scrambled, particularly speech quotes. Has anyone found a way around this?

PS seems like mobi files are still being accepted by Amazon/Kindle, but presumably that will stop eventually?