I hand ported some changes that seemed like they would fix this from the electrum main project.
I hand ported some changes that seemed like they would fix this from the electrum main project.

molecular/electrum,molecular/electrum,molecular/electrum,molecular/electrum