diff --git a/waku-messages/message/waku-message.bpmn b/waku-messages/message/waku-message.bpmn
index 82315d91..f39551fd 100644
--- a/waku-messages/message/waku-message.bpmn
+++ b/waku-messages/message/waku-message.bpmn
@@ -32,7 +32,7 @@
       <bpmn:incoming>Flow_0frd453</bpmn:incoming>
       <bpmn:outgoing>Flow_1b2tmcm</bpmn:outgoing>
       <bpmn:script># Set Message
-waku_message = waku_message_body + "\n- - - - - - - - - - - - - - - - - - - - - - -" + "\nSent: " + local_date_str + " @ " + local_time_str + "\n- - - - - - - - - - - - - - - - - - - - - - -" + waku_message_variables  + waku_message_footer</bpmn:script>
+waku_message = waku_message_body + waku_message_timestamp + waku_message_variables  + waku_message_footer</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:callActivity id="Call_Waku_Messages_Message_Body" name="Call Waku Messages: Message Body" calledElement="Waku_Messages_Message_Body">
       <bpmn:incoming>Flow_0awdfjq</bpmn:incoming>