diff --git a/gui/preload-chat.js b/gui/preload-chat.js
index df2a1a8e..17c6fb1e 100644
--- a/gui/preload-chat.js
+++ b/gui/preload-chat.js
@@ -48,6 +48,7 @@ var selected_callsign = "";
 var lastIsWritingBroadcast = new Date().getTime();
 var defaultUserIcon =
   "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktcGVyc29uLWJvdW5kaW5nLWJveCIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICA8cGF0aCBkPSJNMS41IDFhLjUuNSAwIDAgMC0uNS41djNhLjUuNSAwIDAgMS0xIDB2LTNBMS41IDEuNSAwIDAgMSAxLjUgMGgzYS41LjUgMCAwIDEgMCAxaC0zek0xMSAuNWEuNS41IDAgMCAxIC41LS41aDNBMS41IDEuNSAwIDAgMSAxNiAxLjV2M2EuNS41IDAgMCAxLTEgMHYtM2EuNS41IDAgMCAwLS41LS41aC0zYS41LjUgMCAwIDEtLjUtLjV6TS41IDExYS41LjUgMCAwIDEgLjUuNXYzYS41LjUgMCAwIDAgLjUuNWgzYS41LjUgMCAwIDEgMCAxaC0zQTEuNSAxLjUgMCAwIDEgMCAxNC41di0zYS41LjUgMCAwIDEgLjUtLjV6bTE1IDBhLjUuNSAwIDAgMSAuNS41djNhMS41IDEuNSAwIDAgMS0xLjUgMS41aC0zYS41LjUgMCAwIDEgMC0xaDNhLjUuNSAwIDAgMCAuNS0uNXYtM2EuNS41IDAgMCAxIC41LS41eiIvPgogIDxwYXRoIGQ9Ik0zIDE0cy0xIDAtMS0xIDEtNCA2LTQgNiAzIDYgNC0xIDEtMSAxSDN6bTgtOWEzIDMgMCAxIDEtNiAwIDMgMyAwIDAgMSA2IDB6Ii8+Cjwvc3ZnPg==";
+        var defaultGroupIcon = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktcGVvcGxlLWZpbGwiIHZpZXdCb3g9IjAgMCAxNiAxNiI+CiAgPHBhdGggZD0iTTcgMTRzLTEgMC0xLTEgMS00IDUtNCA1IDMgNSA0LTEgMS0xIDFIN1ptNC02YTMgMyAwIDEgMCAwLTYgMyAzIDAgMCAwIDAgNlptLTUuNzg0IDZBMi4yMzggMi4yMzggMCAwIDEgNSAxM2MwLTEuMzU1LjY4LTIuNzUgMS45MzYtMy43MkE2LjMyNSA2LjMyNSAwIDAgMCA1IDljLTQgMC01IDMtNSA0czEgMSAxIDFoNC4yMTZaTTQuNSA4YTIuNSAyLjUgMCAxIDAgMC01IDIuNSAyLjUgMCAwIDAgMCA1WiIvPgo8L3N2Zz4="
 
 // -----------------------------------
 // Initially fill sharedFolderFileList
@@ -746,12 +747,13 @@ ipcRenderer.on("action-new-msg-received", (event, arg) => {
       console.log(splitted_data);
 
       // add callsign to message:
-      var message = transmitting_station + ":" + splitted_data[4];
+      var message = splitted_data[4];
       console.log(message);
       obj.timestamp = Math.floor(Date.now() / 1000);
       obj.dxcallsign = splitted_data[1];
       obj.dxgrid = "null";
       obj.uuid = splitted_data[3];
+      obj.broadcast_sender = transmitting_station;
       obj.command = "msg";
       obj.checksum = "null";
       obj.msg = message;
@@ -1131,16 +1133,24 @@ update_chat = function (obj) {
       selected_callsign = dxcallsign;
     }
 
+    if (dxcallsign.startsWith("BC-")){
+        var user_image = '<img id="user-image-'+dxcallsign+'" class="p-1 rounded-circle" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktcGVvcGxlLWZpbGwiIHZpZXdCb3g9IjAgMCAxNiAxNiI+CiAgPHBhdGggZD0iTTcgMTRzLTEgMC0xLTEgMS00IDUtNCA1IDMgNSA0LTEgMS0xIDFIN1ptNC02YTMgMyAwIDEgMCAwLTYgMyAzIDAgMCAwIDAgNlptLTUuNzg0IDZBMi4yMzggMi4yMzggMCAwIDEgNSAxM2MwLTEuMzU1LjY4LTIuNzUgMS45MzYtMy43MkE2LjMyNSA2LjMyNSAwIDAgMCA1IDljLTQgMC01IDMtNSA0czEgMSAxIDFoNC4yMTZaTTQuNSA4YTIuNSAyLjUgMCAxIDAgMC01IDIuNSAyLjUgMCAwIDAgMCA1WiIvPgo8L3N2Zz4="></img>';
+
+
+    } else {
+        var user_image = '<img id="user-image-'+dxcallsign+'" class="p-1 rounded-circle" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktcGVyc29uLWNpcmNsZSIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICA8cGF0aCBkPSJNMTEgNmEzIDMgMCAxIDEtNiAwIDMgMyAwIDAgMSA2IDB6Ii8+CiAgPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMCA4YTggOCAwIDEgMSAxNiAwQTggOCAwIDAgMSAwIDh6bTgtN2E3IDcgMCAwIDAtNS40NjggMTEuMzdDMy4yNDIgMTEuMjI2IDQuODA1IDEwIDggMTBzNC43NTcgMS4yMjUgNS40NjggMi4zN0E3IDcgMCAwIDAgOCAxeiIvPgo8L3N2Zz4="></img>';
+
     getSetUserInformation(dxcallsign);
     getSetUserSharedFolder(dxcallsign);
+    }
 
     var new_callsign = `
             <a class="list-group-item list-group-item-action rounded-4 rounded-top rounded-bottom border-1 mb-2 ${callsign_selected}" id="chat-${dxcallsign}-list" data-bs-toggle="list" href="#chat-${dxcallsign}" role="tab" aria-controls="chat-${dxcallsign}">
 
                       <div class="d-flex w-100 justify-content-between">
                           <div class="rounded-circle p-0">
-                            <img id="user-image-${dxcallsign}" class="p-1 rounded-circle" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgZmlsbD0iY3VycmVudENvbG9yIiBjbGFzcz0iYmkgYmktcGVyc29uLWNpcmNsZSIgdmlld0JveD0iMCAwIDE2IDE2Ij4KICA8cGF0aCBkPSJNMTEgNmEzIDMgMCAxIDEtNiAwIDMgMyAwIDAgMSA2IDB6Ii8+CiAgPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMCA4YTggOCAwIDEgMSAxNiAwQTggOCAwIDAgMSAwIDh6bTgtN2E3IDcgMCAwIDAtNS40NjggMTEuMzdDMy4yNDIgMTEuMjI2IDQuODA1IDEwIDggMTBzNC43NTcgMS4yMjUgNS40NjggMi4zN0E3IDcgMCAwIDAgOCAxeiIvPgo8L3N2Zz4="></img>
-                            <!--<i class="bi bi-person-circle p-1" style="font-size:2rem;"></i>-->
+                          ${user_image}
+
                           </div>
 
                         <span style="font-size:1.2rem;"><strong>${dxcallsign}</strong></span>
@@ -1289,6 +1299,16 @@ update_chat = function (obj) {
                             <span class="badge bg-light text-muted">${timestamp}</span>
 
                         </p>
+
+                        <span id="msg-${
+                          obj._id
+                        }-dxcallsign-badge" class="position-absolute top-0 start-100 translate-middle badge rounded-1 bg-secondary border border-white">
+
+                            <span id="msg-${
+                              obj._id
+                            }-attempts" class="">${obj.broadcast_sender}</span>
+                            <span class="visually-hidden">dxcallsign</span>
+                        </span>
                       </div>
                     </div>
                 </div>
@@ -2282,6 +2302,11 @@ function getSetUserInformation(selected_callsign) {
           // split data string by "base64" for separating image type from base64 string
           atob(data.user_info_image.split(";base64,")[1]);
 
+
+    if (selected_callsign.startsWith("BC-")){
+        data.user_info_image = defaultGroupIcon
+    }
+
           document.getElementById("dx_user_info_image").src =
             data.user_info_image;
           document.getElementById("user-image-" + selected_callsign).src =
@@ -2289,9 +2314,16 @@ function getSetUserInformation(selected_callsign) {
         } catch (e) {
           console.log(e);
           console.log("corrupted image data");
+
+             if (selected_callsign.startsWith("BC-")){
+        var userIcon = defaultGroupIcon;
+    } else {
+    var userIcon = defaultUserIcon;
+    }
+
           document.getElementById("user-image-" + selected_callsign).src =
-            defaultUserIcon;
-          document.getElementById("dx_user_info_image").src = defaultUserIcon;
+            userIcon;
+          document.getElementById("dx_user_info_image").src = userIcon;
         }
       } else {
         // throw error and use placeholder data
@@ -2347,9 +2379,15 @@ function getSetUserInformation(selected_callsign) {
       console.log("writing user info to modal failed");
       console.log(err);
 
+ if (selected_callsign.startsWith("BC-")){
+        var userIcon = defaultGroupIcon;
+    } else {
+    var userIcon = defaultUserIcon;
+    }
+
       // Callsign list elements
       document.getElementById("user-image-" + selected_callsign).src =
-        defaultUserIcon;
+        userIcon;
       document.getElementById("user-image-" + selected_callsign).className =
         "p-1 rounded-circle w-100";
       document.getElementById("user-image-" + selected_callsign).style =