Closes https://github.com/WhisperSystems/TextSecure/pull/4916 Fixes https://github.com/WhisperSystems/TextSecure/issues/4714 Upstream commit: https://github.com/WhisperSystems/TextSecure/commit/4fa6680f835f51689ccebe986210e3bdef121df1