Bug 835149 - [email/IMAP] folder list sync breaks if IMAP server (ex: courier) returns folders in non-hierarchy order.
Merge pull request #117 from asutherland/imap-unordered-hierarchy-fix

Bug 835149 - [email/IMAP] folder list sync breaks if IMAP server (ex: courier) returns folders in non-hierarchy order. r=squib
Bug 833213 - [Email] Search breaks on empty subject; visible in "subject" and "all" search filters.
Merge pull request #118 from asutherland/search-null-subjects

Bug 833213 - [Email] Search breaks on empty subject; visible in "subject" and "all" search filters. r=squib