Bug: 12370 Attempt to work around broken Blackberry clients.