Yeah, it only seems to be an issue for me when the portrait photos are really big. Resizing to about 1600 (or might be 1200, I can't remember now) on the longest side seems to solve it.
That's probably why sending back and forth over WhatsApp does the trick - because it automatically resizes.