The irony is that I started to use WhatsApp only 2-3 months ago after learning they are doing end to end encryption. Oh well, guess it's time to uninstall it.
There's also the newly open-sourced Wire - it has the same dependence on Google, but it supports video calling and some might prefer their UI.