diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ContactGroup.java b/core/src/main/java/org/jivesoftware/spark/ui/ContactGroup.java
index 4115a40ea..8bff4fe4a 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/ContactGroup.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/ContactGroup.java
@@ -809,13 +809,15 @@ public class ContactGroup extends CollapsiblePane implements MouseListener {
     }
 
     public Collection<ContactItem> getOfflineContacts() {
-        return new ArrayList<>(offlineContacts);
+        final List<ContactItem> list = new ArrayList<>(offlineContacts);
+        list.sort(itemComparator);
+        return list;
     }
 
     /**
      * Sorts ContactItems.
      */
-    final protected Comparator<ContactItem> itemComparator = Comparator.comparing(item -> item.getDisplayName().toLowerCase());
+    private final static Comparator<ContactItem> itemComparator = Comparator.comparing(item -> item.getDisplayName().toLowerCase());
 
     /**
      * Returns true if this ContactGroup is the Offline Group.
diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ContactList.java b/core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
index 700094e0f..eb420f4da 100644
--- a/core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
+++ b/core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
@@ -2517,11 +2517,6 @@ public class ContactList extends JPanel implements ActionListener,
         return unfiledGroup;
     }
 
-    /**
-     * Sorts ContactItems.
-     */
-    public final static Comparator<ContactItem> ContactItemComparator = Comparator.comparing(item -> item.getDisplayName().toLowerCase());
-
     public void showAddContact(String contact) {
         addContactMenu.doClick();
     }
diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
index 61e5d1fd2..46c86dc1f 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
@@ -123,10 +123,7 @@ public class BroadcastDialog extends JPanel {
                 nodes.add(itemNode);
             }
 
-            final List<ContactItem> offlineContacts = new ArrayList<>( group.getOfflineContacts() );
-            offlineContacts.sort(ContactList.ContactItemComparator);
-
-            for (ContactItem item : offlineContacts) {
+            for (ContactItem item : group.getOfflineContacts()) {
                 CheckNode itemNode = new CheckNode(item.getDisplayName(), false, item.getIcon());
                 itemNode.setAssociatedObject(item.getJid().toString());
                 groupNode.add(itemNode);