Testing the fix to MC-7424, I still cant seem to get the falling out of water message to show up.
On a related note, there seems to be no message for falling out of lava.
It seems that the removal of this message has resulted in the following bug: MC-195467
Missing death message "death.fell.accident.water" and its localization
Fall damage death messages don't show block player fall from correctly (ladders, vines, water)