diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index c6dfd1cbb..71edda951 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -560,7 +560,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
                                             String headerTitle;
 
-                                            headerTitle = participant.getName().substring(0, 1).toUpperCase();
+                                            if (!autocompleteUser.getSource().equals("groups")) {
+                                                headerTitle = participant.getName().substring(0, 1).toUpperCase();
+                                            } else {
+                                                headerTitle = getResources().getString(R.string.nc_groups);
+                                            }
 
                                             GenericTextHeaderItem genericTextHeaderItem;
                                             if (!userHeaderItems.containsKey(headerTitle)) {
@@ -605,6 +609,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                                 String firstName;
                                 String secondName;
 
+
                                 if (o1 instanceof UserItem) {
                                     firstName = ((UserItem) o1).getModel().getName();
                                 } else {
@@ -617,6 +622,16 @@ public class ContactsController extends BaseController implements SearchView.OnQ
                                     secondName = ((GenericTextHeaderItem) o2).getModel();
                                 }
 
+                                if (o1 instanceof  UserItem && o2 instanceof UserItem) {
+                                    if ("groups".equals(((UserItem) o1).getModel().getSource()) && "groups".equals(((UserItem) o2).getModel().getSource())) {
+                                        return firstName.compareToIgnoreCase(secondName);
+                                    } else if ("groups".equals(((UserItem) o1).getModel().getSource())) {
+                                        return -1;
+                                    } else if ("groups".equals(((UserItem) o2).getModel().getSource())) {
+                                        return 1;
+                                    }
+                                }
+
                                 return firstName.compareToIgnoreCase(secondName);
                             });
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55a4da411..d0f8fd247 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -239,5 +239,6 @@ Find Nextcloud on https://nextcloud.com</string>
 
     <!-- Other -->
     <string name="nc_limit_hit">1000 characters limit has been hit</string>
+    <string name="nc_groups">Groups</string>
 
 </resources>