diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index c29f933d6..1de52b772 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -775,6 +775,7 @@ CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
 CommCourseHeading: Kursmitteilung
 
 RecipientCustom: Weitere Empfänger
+RecipientToggleAll: Alle/Keine
 
 RGCourseParticipants: Kursteilnehmer
 RGCourseLecturers: Kursverwalter
diff --git a/templates/widgets/communication/recipientLayout.hamlet b/templates/widgets/communication/recipientLayout.hamlet
index 646bc7e01..5f47cb7b7 100644
--- a/templates/widgets/communication/recipientLayout.hamlet
+++ b/templates/widgets/communication/recipientLayout.hamlet
@@ -3,18 +3,20 @@ $if not (null activeCategories)
   <div .recipient-categories>
     $forall category <- activeCategories
       <div .recipient-category>
-        <input type=checkbox id=#{checkedIdent category} :elem category checkedCategories:checked>
+        <input type=checkbox id=#{checkedIdent category} .recipient-category__checkbox :elem category checkedCategories:checked>
         <label .recipient-category__label for=#{checkedIdent category}>
           _{category}
 
         $if hasContent category
           <fieldset .recipient-category__fieldset uw-interactive-fieldset .interactive-fieldset__target data-conditional-input=#{checkedIdent category}>
             $if not (null (categoryIndices category))
-              $# TODO: unique id for this all/none checkbox
-              <input type=checkbox id=tbd .recipient-category__toggle-all>
-              <label for=tbd>Label
-              $forall optIx <- categoryIndices category
-                ^{cellWdgts ! optIx}
+              <div .recipient-category__checked-counter>
+              <div .recipient-category__toggle-all>
+                <input type=checkbox id=#{checkedIdent category}-toggle-all>
+                <label for=#{checkedIdent category}-toggle-all .recipient-category__option-label>_{MsgRecipientToggleAll}
+              <div .recipient-category__options>
+                $forall optIx <- categoryIndices category
+                  ^{cellWdgts ! optIx}
 
             $maybe addWdgt <- addWdgts !? (1, (EnumPosition category, 0))
               ^{addWdgt}
diff --git a/templates/widgets/communication/recipientLayout.julius b/templates/widgets/communication/recipientLayout.julius
index 87dfead6b..d2fc512ab 100644
--- a/templates/widgets/communication/recipientLayout.julius
+++ b/templates/widgets/communication/recipientLayout.julius
@@ -1,34 +1,87 @@
-// TODO: js utility to check all/none of the checkboxes in a recipient category at once
 (function() {
 
+  var MASS_INPUT_SELECTOR = '.massinput';
   var RECIPIENT_CATEGORIES_SELECTOR = '.recipient-categories';
   var RECIPIENT_CATEGORY_SELECTOR = '.recipient-category';
-  var RECIPIENT_CATEGORY_FIELDSET_SELECTOR = '.recipient-category__fieldset';
-  var RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR = '.recipient-category__toggle-all';
+  var RECIPIENT_CATEGORY_CHECKBOX_SELECTOR = '.recipient-category__checkbox ';
+  var RECIPIENT_CATEGORY_OPTIONS_SELECTOR = '.recipient-category__options';
+  var RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR = '.recipient-category__toggle-all [type="checkbox"]';
+  var RECIPIENT_CATEGORY_CHECKED_COUNTER_SELECTOR = '.recipient-category__checked-counter';
+
+  var massInputElement;
 
   document.addEventListener('DOMContentLoaded', function() {
-
     var recipientCategoriesElement = document.querySelector(RECIPIENT_CATEGORIES_SELECTOR);
-    var recipientCategoryElements = Array.from(recipientCategoriesElement.querySelectorAll(RECIPIENT_CATEGORY_SELECTOR));
+    massInputElement = recipientCategoriesElement.closest(MASS_INPUT_SELECTOR);
+
+    setupRecipientCategories();
+
+    var recipientObserver = new MutationObserver(setupRecipientCategories);
+    recipientObserver.observe(massInputElement, { childList: true });
+  });
+
+  function setupRecipientCategories() {
+    var recipientCategoryElements = Array.from(massInputElement.querySelectorAll(RECIPIENT_CATEGORY_SELECTOR));
 
     recipientCategoryElements.forEach(function(element) {
       setupRecipientCategory(element);
     });
-  });
+  }
 
   function setupRecipientCategory(recipientCategoryElement) {
-    var fieldset = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_FIELDSET_SELECTOR);
-    var categoryCheckboxes = Array.from(fieldset.querySelectorAll('[type="checkbox"]'));
+    var categoryCheckbox = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_CHECKBOX_SELECTOR);
+    var categoryOptions = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_OPTIONS_SELECTOR);
+    if (categoryOptions) {
 
-    if (categoryCheckboxes) {
+      var categoryCheckboxes = Array.from(categoryOptions.querySelectorAll('[type="checkbox"]'));
       var toggleAllCheckbox = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_TOGGLE_ALL_SELECTOR);
 
+      // setup category checkbox to toggle all child checkboxes if changed
+      categoryCheckbox.addEventListener('change', function() {
+        categoryCheckboxes.forEach(function(checkbox) {
+          checkbox.checked = categoryCheckbox.checked;
+        });
+        updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+        updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+      });
+
+      // update counter and toggle checkbox initially
+      updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+      updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+
+      // register change listener for individual checkboxes
+      categoryCheckboxes.forEach(function(checkbox) {
+        checkbox.addEventListener('change', function() {
+          updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
+          updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes);
+        });
+      });
+
+      // register change listener for toggle all checkbox
       if (toggleAllCheckbox) {
         toggleAllCheckbox.addEventListener('change', function() {
-          console.log('TBD: setting up toggle all checkbox');
+          categoryCheckboxes.forEach(function(checkbox) {
+            checkbox.checked = toggleAllCheckbox.checked;
+          });
+          updateCheckedCounter(recipientCategoryElement, categoryCheckboxes);
         });
       }
     }
   }
 
+  // update checked state of toggle all checkbox based on all other checkboxes
+  function updateToggleAllCheckbox(toggleAllCheckbox, categoryCheckboxes) {
+    var allChecked = categoryCheckboxes.reduce(function(acc, checkbox) {
+      return acc && checkbox.checked;
+    }, true);
+    toggleAllCheckbox.checked = allChecked;
+  }
+
+  // update value of checked counter
+  function updateCheckedCounter(recipientCategoryElement, categoryCheckboxes) {
+    var checkedCounter = recipientCategoryElement.querySelector(RECIPIENT_CATEGORY_CHECKED_COUNTER_SELECTOR);
+    var checkedCheckboxes = categoryCheckboxes.reduce(function(acc, checkbox) { return checkbox.checked ? acc + 1 : acc; }, 0);
+    checkedCounter.innerHTML = checkedCheckboxes + '/' + categoryCheckboxes.length;
+  }
+
 })();
diff --git a/templates/widgets/communication/recipientLayout.lucius b/templates/widgets/communication/recipientLayout.lucius
index df68114dd..a48065a68 100644
--- a/templates/widgets/communication/recipientLayout.lucius
+++ b/templates/widgets/communication/recipientLayout.lucius
@@ -32,6 +32,7 @@
   padding-left: 16px;
   max-height: 200px;
   overflow-y: auto;
+  position: relative;
 }
 
 .recipient-category__option-add {
@@ -42,3 +43,20 @@
     padding: 10px 0;
   }
 }
+
+.recipient-category__options + .recipient-category__option-add {
+  margin-top: 10px;
+}
+
+.recipient-category__toggle-all {
+  display: flex;
+  border-bottom: 1px solid #bcbcbc;
+  padding-bottom: 8px;
+  margin-bottom: 8px;
+}
+
+.recipient-category__checked-counter {
+  position: absolute;
+  right: 0;
+  top: 0;
+}