Bug 1052327 - Fix crash caused by buffer overrun. r=irving,a=Standard8 for CLOSED TREE
Bug 950335 - "Force encryption" changed by "Use encryption if available" after XMPP wizard. r=florian,a=Standard8 for CLOSED TREE