diff --git a/lxmf_bridge_mqtt/lxmf_bridge_mqtt.py b/lxmf_bridge_mqtt/lxmf_bridge_mqtt.py
index cadfeb3..8722d60 100755
--- a/lxmf_bridge_mqtt/lxmf_bridge_mqtt.py
+++ b/lxmf_bridge_mqtt/lxmf_bridge_mqtt.py
@@ -769,7 +769,7 @@ def mqtt_message_received_callback_send(client, userdata, message):
         if message_data["date_time"] != "":
             timestamp = time.mktime(datetime.datetime.strptime(message_data["date_time"], '%Y-%m-%d %H:%M:%S').timetuple())
 
-    LXMF_CONNECTION.send(message_data["destination"].strip(), content, message_data["title"].strip(), timestamp)
+    LXMF_CONNECTION.send(message_data["destination"].strip(), content, message_data["title"].strip(), None, timestamp)
 
 
 ##############################################################################################################
diff --git a/lxmf_cmd/lxmf_cmd.py b/lxmf_cmd/lxmf_cmd.py
index e4c77f2..c4b9f64 100755
--- a/lxmf_cmd/lxmf_cmd.py
+++ b/lxmf_cmd/lxmf_cmd.py
@@ -587,7 +587,7 @@ def lxmf_message_received_callback(message):
         if search != "":
             content = re.sub(search, config_get(CONFIG, "message", "send_regex_replace"), content)
 
-        LXMF_CONNECTION.send(message.source_hash, content_prefix + content + content_suffix, "")
+        LXMF_CONNECTION.send(message.source_hash, content_prefix + content + content_suffix)
     else:
         log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not allowed", LOG_DEBUG)
         return
diff --git a/lxmf_distribution_group_minimal/lxmf_distribution_group_minimal.py b/lxmf_distribution_group_minimal/lxmf_distribution_group_minimal.py
index c52dd6e..c1446ee 100755
--- a/lxmf_distribution_group_minimal/lxmf_distribution_group_minimal.py
+++ b/lxmf_distribution_group_minimal/lxmf_distribution_group_minimal.py
@@ -608,8 +608,6 @@ def lxmf_message_received_callback(message):
 
         content = content_prefix + content + content_suffix
 
-        title = message.title.decode('utf-8')
-
         if config_get(CONFIG, "message", "timestamp") == "client":
             timestamp = message.timestamp
         else:
@@ -619,7 +617,7 @@ def lxmf_message_received_callback(message):
             if "receive" in section:
                 for (key, val) in DATA.items(section):
                     if key != source_hash:
-                        LXMF_CONNECTION.send(key, content, title, timestamp)
+                        LXMF_CONNECTION.send(key, content, title, None, timestamp)
         return
     else:
         log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " 'send' not allowed", LOG_DEBUG)
diff --git a/lxmf_ping/lxmf_ping.py b/lxmf_ping/lxmf_ping.py
index fee26a7..5225147 100755
--- a/lxmf_ping/lxmf_ping.py
+++ b/lxmf_ping/lxmf_ping.py
@@ -739,9 +739,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, dest="", inter
                 content = "#"+ str(DATA[key]["count"]) + " " + content
                 content = content[:size]
                 if key == ".":
-                    LXMF_CONNECTION.send(secrets.token_hex(nbytes=10), content, "")
+                    LXMF_CONNECTION.send(secrets.token_hex(nbytes=10), content)
                 else:
-                    LXMF_CONNECTION.send(key, content, "")
+                    LXMF_CONNECTION.send(key, content)
                 print("Destination: " + str (key) + "  |  #: " + str(DATA[key]["count"]) + "  |  Messages delivered: " + str(DATA[key]["count_success"]) + "/" + str(DATA[key]["count"]) + " (" + str(round(100/DATA[key]["count"]*DATA[key]["count_success"], 2)) + "%)  |  Time (min / max / avg): " + str(DATA[key]["time_min"]) + " / " + str(DATA[key]["time_max"]) + " / " + str(DATA[key]["time_avg"]) + "  |  Info: Sending/Queued")
         time.sleep(interval)
 
diff --git a/lxmf_terminal/lxmf_terminal.py b/lxmf_terminal/lxmf_terminal.py
index 2cf4cdd..b56f02d 100755
--- a/lxmf_terminal/lxmf_terminal.py
+++ b/lxmf_terminal/lxmf_terminal.py
@@ -763,7 +763,7 @@ def output_now():
         if search != "":
             output = re.sub(search, config_get(CONFIG, "message", "send_regex_replace"), output)
 
-        LXMF_CONNECTION.send(SESSION["source"], content_prefix + output + content_suffix, "")
+        LXMF_CONNECTION.send(SESSION["source"], content_prefix + output + content_suffix)
 
     return True