diff --git a/apps/bridge-worker/tasks/fetch-signal-messages.ts b/apps/bridge-worker/tasks/fetch-signal-messages.ts
index cf9bfc2..d3cab1f 100644
--- a/apps/bridge-worker/tasks/fetch-signal-messages.ts
+++ b/apps/bridge-worker/tasks/fetch-signal-messages.ts
@@ -15,11 +15,13 @@ const fetchSignalMessagesTask = async (): Promise<void> => {
     const messages = await messagesClient.v1ReceiveNumberGet({ number });
 
     for (const msg of messages) {
+      console.log(msg);
       const { envelope } = msg as any;
       const { source, sourceUuid, dataMessage } = envelope;
-      const messageId = sourceUuid;
       const message = dataMessage?.message;
-      const timestamp = new Date(dataMessage?.timestamp);
+      const rawTimestamp = dataMessage?.timestamp;
+      const timestamp = new Date(rawTimestamp);
+      const messageId = `${sourceUuid}-${rawTimestamp}`;
       const attachment = undefined;
       const mimeType = undefined;
       const filename = undefined;
diff --git a/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_signal.rb b/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_signal.rb
index ce2f075..e258c33 100644
--- a/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_signal.rb
+++ b/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_signal.rb
@@ -23,7 +23,7 @@ class Channel
       #       )
       #
 
-      def send(options, article, _notification = false)
+      def deliver(options, article, _notification = false)
         # return if we run import mode
         return if Setting.get('import_mode')
 
diff --git a/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_whatsapp.rb b/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_whatsapp.rb
index d97d0ae..f516d83 100644
--- a/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_whatsapp.rb
+++ b/packages/zammad-addon-bridge/src/app/models/channel/driver/cdr_whatsapp.rb
@@ -21,8 +21,8 @@ class Channel::Driver::CdrWhatsapp
       #       )
       #
 
-      def send(options, article, _notification = false)
-        # return if we run import mode   
+      def deliver(options, article, _notification = false)
+        # return if we run import mode
         return if Setting.get('import_mode')
 
         options = check_external_credential(options)