Bug 901948 - Handle the case of (sortKey == byNone) properly. r=irving
Bug 945200 - Lock icon shows on non-secure servers when collapsed in folder pane. r=JosiahOne