diff --git a/src/common/app_helper.c b/src/common/app_helper.c
index 5e991a8e..18fa0084 100644
--- a/src/common/app_helper.c
+++ b/src/common/app_helper.c
@@ -81,12 +81,16 @@ process_chunk_response_t process_chunk(__Z_UNUSED volatile uint32_t *tx, uint32_
             }
             switch (p2) {
                 case 0x01:
+                    zemu_log("Transaction witout metadata.\n");
                     return PROCESS_CHUNK_FINISHED_NO_METADATA;
                 case 0x02:
+                    zemu_log("Transaction to match nft1 script.\n");
                     return PROCESS_CHUNK_FINISHED_NFT1;
                 case 0x03:
+                    zemu_log("Transaction to match nft2 script.\n");
                     return PROCESS_CHUNK_FINISHED_NFT2;
                 default:
+                    zemu_log("Incalid P2 transaction type.\n");
                     THROW(APDU_CODE_INVALIDP1P2);
             }
         case 0x03:
@@ -110,6 +114,7 @@ process_chunk_response_t process_chunk(__Z_UNUSED volatile uint32_t *tx, uint32_
             }
             return PROCESS_CHUNK_FINISHED_WITH_METADATA;
         case 0x10:
+            zemu_log("Message to sign.\n");
             added = tx_append(&(G_io_apdu_buffer[OFFSET_DATA]), rx - OFFSET_DATA);
             if (added != rx - OFFSET_DATA) {
                 THROW(APDU_CODE_OUTPUT_BUFFER_TOO_SMALL);
diff --git a/tests/application_client/flow_command_sender.py b/tests/application_client/flow_command_sender.py
index 700a0d9d..4528e332 100644
--- a/tests/application_client/flow_command_sender.py
+++ b/tests/application_client/flow_command_sender.py
@@ -27,6 +27,7 @@ class P1(IntEnum):
     P1_INIT = 0x00
     P1_ADD  = 0x01
     P1_LAST = 0x02
+    P1_LAST_MESSAGE = 0x10
 
 class P2(IntEnum):
     """ Parameter 2 definitions """
@@ -231,6 +232,7 @@ def sign_tx(
         curve: CurveChoice,
         transaction: bytes,
         hash_t: HashType,
+        hint: str = ""
     ) -> Generator[None, None, None]:
         """ APDU sign transaction """
 
@@ -246,11 +248,18 @@ def sign_tx(
                                   ins=InsType.SIGN,
                                   p1=P1.P1_ADD,
                                   data=msg)
+                                  
+        if (hint == "message"):
+            p1 = P1.P1_LAST_MESSAGE
+            p2 = 0
+        else:
+            p1 = P1.P1_LAST
+            p2 = P2.P2_NO_METADATA
 
         with self.backend.exchange_async(cla=ClaType.CLA_APP,
                                         ins=InsType.SIGN,
-                                        p1=P1.P1_LAST,
-                                        p2=P2.P2_NO_METADATA,
+                                        p1=p1,
+                                        p2=p2,
                                         data=messages[-1]) as response:
             yield response
 
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00000.png b/tests/snapshots/nanos/test_message_normal/part0/00000.png
new file mode 100644
index 00000000..ca19a0c3
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00000.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00001.png b/tests/snapshots/nanos/test_message_normal/part0/00001.png
new file mode 100644
index 00000000..57c1d8cc
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00001.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00002.png b/tests/snapshots/nanos/test_message_normal/part0/00002.png
new file mode 100644
index 00000000..8782b4de
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00002.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00003.png b/tests/snapshots/nanos/test_message_normal/part0/00003.png
new file mode 100644
index 00000000..f9c1e1e8
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00003.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00004.png b/tests/snapshots/nanos/test_message_normal/part0/00004.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00004.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part0/00005.png b/tests/snapshots/nanos/test_message_normal/part0/00005.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part0/00005.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00000.png b/tests/snapshots/nanos/test_message_normal/part1/00000.png
new file mode 100644
index 00000000..ca19a0c3
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00000.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00001.png b/tests/snapshots/nanos/test_message_normal/part1/00001.png
new file mode 100644
index 00000000..72882952
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00001.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00002.png b/tests/snapshots/nanos/test_message_normal/part1/00002.png
new file mode 100644
index 00000000..7e7b1fa6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00002.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00003.png b/tests/snapshots/nanos/test_message_normal/part1/00003.png
new file mode 100644
index 00000000..547d2fb7
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00003.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00004.png b/tests/snapshots/nanos/test_message_normal/part1/00004.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00004.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part1/00005.png b/tests/snapshots/nanos/test_message_normal/part1/00005.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part1/00005.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part2/00000.png b/tests/snapshots/nanos/test_message_normal/part2/00000.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part2/00000.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part2/00001.png b/tests/snapshots/nanos/test_message_normal/part2/00001.png
new file mode 100644
index 00000000..85d9725b
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part2/00001.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part2/00002.png b/tests/snapshots/nanos/test_message_normal/part2/00002.png
new file mode 100644
index 00000000..50bcea8e
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part2/00002.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part2/00003.png b/tests/snapshots/nanos/test_message_normal/part2/00003.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part2/00003.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00000.png b/tests/snapshots/nanos/test_message_normal/part3/00000.png
new file mode 100644
index 00000000..ca19a0c3
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00000.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00001.png b/tests/snapshots/nanos/test_message_normal/part3/00001.png
new file mode 100644
index 00000000..57c1d8cc
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00001.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00002.png b/tests/snapshots/nanos/test_message_normal/part3/00002.png
new file mode 100644
index 00000000..8782b4de
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00002.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00003.png b/tests/snapshots/nanos/test_message_normal/part3/00003.png
new file mode 100644
index 00000000..f9c1e1e8
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00003.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00004.png b/tests/snapshots/nanos/test_message_normal/part3/00004.png
new file mode 100644
index 00000000..d4fe3ec9
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00004.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00005.png b/tests/snapshots/nanos/test_message_normal/part3/00005.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00005.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part3/00006.png b/tests/snapshots/nanos/test_message_normal/part3/00006.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part3/00006.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00000.png b/tests/snapshots/nanos/test_message_normal/part4/00000.png
new file mode 100644
index 00000000..ca19a0c3
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00000.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00001.png b/tests/snapshots/nanos/test_message_normal/part4/00001.png
new file mode 100644
index 00000000..72882952
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00001.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00002.png b/tests/snapshots/nanos/test_message_normal/part4/00002.png
new file mode 100644
index 00000000..7e7b1fa6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00002.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00003.png b/tests/snapshots/nanos/test_message_normal/part4/00003.png
new file mode 100644
index 00000000..547d2fb7
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00003.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00004.png b/tests/snapshots/nanos/test_message_normal/part4/00004.png
new file mode 100644
index 00000000..697c001b
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00004.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00005.png b/tests/snapshots/nanos/test_message_normal/part4/00005.png
new file mode 100644
index 00000000..006c26ab
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00005.png differ
diff --git a/tests/snapshots/nanos/test_message_normal/part4/00006.png b/tests/snapshots/nanos/test_message_normal/part4/00006.png
new file mode 100644
index 00000000..7f6ab5e6
Binary files /dev/null and b/tests/snapshots/nanos/test_message_normal/part4/00006.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00000.png b/tests/snapshots/nanosp/test_message_normal/part0/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00001.png b/tests/snapshots/nanosp/test_message_normal/part0/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00002.png b/tests/snapshots/nanosp/test_message_normal/part0/00002.png
new file mode 100644
index 00000000..9a276d55
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00003.png b/tests/snapshots/nanosp/test_message_normal/part0/00003.png
new file mode 100644
index 00000000..7e49f56f
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00004.png b/tests/snapshots/nanosp/test_message_normal/part0/00004.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part0/00005.png b/tests/snapshots/nanosp/test_message_normal/part0/00005.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part0/00005.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00000.png b/tests/snapshots/nanosp/test_message_normal/part1/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00001.png b/tests/snapshots/nanosp/test_message_normal/part1/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00002.png b/tests/snapshots/nanosp/test_message_normal/part1/00002.png
new file mode 100644
index 00000000..cf795648
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00002.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00003.png b/tests/snapshots/nanosp/test_message_normal/part1/00003.png
new file mode 100644
index 00000000..b6b0217c
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00003.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00004.png b/tests/snapshots/nanosp/test_message_normal/part1/00004.png
new file mode 100644
index 00000000..8b16b4d9
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00004.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00005.png b/tests/snapshots/nanosp/test_message_normal/part1/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00005.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part1/00006.png b/tests/snapshots/nanosp/test_message_normal/part1/00006.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part1/00006.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part2/00000.png b/tests/snapshots/nanosp/test_message_normal/part2/00000.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part2/00000.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part2/00001.png b/tests/snapshots/nanosp/test_message_normal/part2/00001.png
new file mode 100644
index 00000000..e10e0049
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part2/00001.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part2/00002.png b/tests/snapshots/nanosp/test_message_normal/part2/00002.png
new file mode 100644
index 00000000..7e236da6
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part2/00002.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part2/00003.png b/tests/snapshots/nanosp/test_message_normal/part2/00003.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part2/00003.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00000.png b/tests/snapshots/nanosp/test_message_normal/part3/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00000.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00001.png b/tests/snapshots/nanosp/test_message_normal/part3/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00001.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00002.png b/tests/snapshots/nanosp/test_message_normal/part3/00002.png
new file mode 100644
index 00000000..9a276d55
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00002.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00003.png b/tests/snapshots/nanosp/test_message_normal/part3/00003.png
new file mode 100644
index 00000000..7e49f56f
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00003.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00004.png b/tests/snapshots/nanosp/test_message_normal/part3/00004.png
new file mode 100644
index 00000000..94fa1038
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00004.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00005.png b/tests/snapshots/nanosp/test_message_normal/part3/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00005.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part3/00006.png b/tests/snapshots/nanosp/test_message_normal/part3/00006.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part3/00006.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00000.png b/tests/snapshots/nanosp/test_message_normal/part4/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00000.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00001.png b/tests/snapshots/nanosp/test_message_normal/part4/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00001.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00002.png b/tests/snapshots/nanosp/test_message_normal/part4/00002.png
new file mode 100644
index 00000000..cf795648
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00002.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00003.png b/tests/snapshots/nanosp/test_message_normal/part4/00003.png
new file mode 100644
index 00000000..b6b0217c
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00003.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00004.png b/tests/snapshots/nanosp/test_message_normal/part4/00004.png
new file mode 100644
index 00000000..8b16b4d9
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00004.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00005.png b/tests/snapshots/nanosp/test_message_normal/part4/00005.png
new file mode 100644
index 00000000..2a16d649
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00005.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00006.png b/tests/snapshots/nanosp/test_message_normal/part4/00006.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00006.png differ
diff --git a/tests/snapshots/nanosp/test_message_normal/part4/00007.png b/tests/snapshots/nanosp/test_message_normal/part4/00007.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanosp/test_message_normal/part4/00007.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00000.png b/tests/snapshots/nanox/test_message_normal/part0/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00000.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00001.png b/tests/snapshots/nanox/test_message_normal/part0/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00001.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00002.png b/tests/snapshots/nanox/test_message_normal/part0/00002.png
new file mode 100644
index 00000000..0f36734e
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00002.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00003.png b/tests/snapshots/nanox/test_message_normal/part0/00003.png
new file mode 100644
index 00000000..24b411d6
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00003.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00004.png b/tests/snapshots/nanox/test_message_normal/part0/00004.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00004.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part0/00005.png b/tests/snapshots/nanox/test_message_normal/part0/00005.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part0/00005.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00000.png b/tests/snapshots/nanox/test_message_normal/part1/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00000.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00001.png b/tests/snapshots/nanox/test_message_normal/part1/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00001.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00002.png b/tests/snapshots/nanox/test_message_normal/part1/00002.png
new file mode 100644
index 00000000..fc4e7e0d
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00002.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00003.png b/tests/snapshots/nanox/test_message_normal/part1/00003.png
new file mode 100644
index 00000000..b6b0217c
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00003.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00004.png b/tests/snapshots/nanox/test_message_normal/part1/00004.png
new file mode 100644
index 00000000..8b16b4d9
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00004.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00005.png b/tests/snapshots/nanox/test_message_normal/part1/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00005.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part1/00006.png b/tests/snapshots/nanox/test_message_normal/part1/00006.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part1/00006.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part2/00000.png b/tests/snapshots/nanox/test_message_normal/part2/00000.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part2/00000.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part2/00001.png b/tests/snapshots/nanox/test_message_normal/part2/00001.png
new file mode 100644
index 00000000..8472e5d9
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part2/00001.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part2/00002.png b/tests/snapshots/nanox/test_message_normal/part2/00002.png
new file mode 100644
index 00000000..f7921677
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part2/00002.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part2/00003.png b/tests/snapshots/nanox/test_message_normal/part2/00003.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part2/00003.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00000.png b/tests/snapshots/nanox/test_message_normal/part3/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00000.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00001.png b/tests/snapshots/nanox/test_message_normal/part3/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00001.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00002.png b/tests/snapshots/nanox/test_message_normal/part3/00002.png
new file mode 100644
index 00000000..0f36734e
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00002.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00003.png b/tests/snapshots/nanox/test_message_normal/part3/00003.png
new file mode 100644
index 00000000..24b411d6
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00003.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00004.png b/tests/snapshots/nanox/test_message_normal/part3/00004.png
new file mode 100644
index 00000000..94fa1038
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00004.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00005.png b/tests/snapshots/nanox/test_message_normal/part3/00005.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00005.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part3/00006.png b/tests/snapshots/nanox/test_message_normal/part3/00006.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part3/00006.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00000.png b/tests/snapshots/nanox/test_message_normal/part4/00000.png
new file mode 100644
index 00000000..3e327861
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00000.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00001.png b/tests/snapshots/nanox/test_message_normal/part4/00001.png
new file mode 100644
index 00000000..d3179deb
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00001.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00002.png b/tests/snapshots/nanox/test_message_normal/part4/00002.png
new file mode 100644
index 00000000..fc4e7e0d
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00002.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00003.png b/tests/snapshots/nanox/test_message_normal/part4/00003.png
new file mode 100644
index 00000000..b6b0217c
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00003.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00004.png b/tests/snapshots/nanox/test_message_normal/part4/00004.png
new file mode 100644
index 00000000..8b16b4d9
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00004.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00005.png b/tests/snapshots/nanox/test_message_normal/part4/00005.png
new file mode 100644
index 00000000..2a16d649
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00005.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00006.png b/tests/snapshots/nanox/test_message_normal/part4/00006.png
new file mode 100644
index 00000000..1e4be699
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00006.png differ
diff --git a/tests/snapshots/nanox/test_message_normal/part4/00007.png b/tests/snapshots/nanox/test_message_normal/part4/00007.png
new file mode 100644
index 00000000..e84e8dfd
Binary files /dev/null and b/tests/snapshots/nanox/test_message_normal/part4/00007.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part0/00000.png b/tests/snapshots/stax/test_message_normal/part0/00000.png
new file mode 100644
index 00000000..8e091e97
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part0/00000.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part0/00001.png b/tests/snapshots/stax/test_message_normal/part0/00001.png
new file mode 100644
index 00000000..53374137
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part0/00001.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part0/00002.png b/tests/snapshots/stax/test_message_normal/part0/00002.png
new file mode 100644
index 00000000..f1c11f39
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part0/00002.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part0/00003.png b/tests/snapshots/stax/test_message_normal/part0/00003.png
new file mode 100644
index 00000000..cd2f5275
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part0/00003.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part0/00004.png b/tests/snapshots/stax/test_message_normal/part0/00004.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part0/00004.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00000.png b/tests/snapshots/stax/test_message_normal/part1/00000.png
new file mode 100644
index 00000000..8e091e97
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00000.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00001.png b/tests/snapshots/stax/test_message_normal/part1/00001.png
new file mode 100644
index 00000000..dc1361ec
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00001.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00002.png b/tests/snapshots/stax/test_message_normal/part1/00002.png
new file mode 100644
index 00000000..8a45b30f
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00002.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00003.png b/tests/snapshots/stax/test_message_normal/part1/00003.png
new file mode 100644
index 00000000..6b9ca454
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00003.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00004.png b/tests/snapshots/stax/test_message_normal/part1/00004.png
new file mode 100644
index 00000000..cd2f5275
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00004.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part1/00005.png b/tests/snapshots/stax/test_message_normal/part1/00005.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part1/00005.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part2/00000.png b/tests/snapshots/stax/test_message_normal/part2/00000.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part2/00000.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part2/00001.png b/tests/snapshots/stax/test_message_normal/part2/00001.png
new file mode 100644
index 00000000..b470791c
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part2/00001.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part2/00002.png b/tests/snapshots/stax/test_message_normal/part2/00002.png
new file mode 100644
index 00000000..627f1c4e
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part2/00002.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part2/00003.png b/tests/snapshots/stax/test_message_normal/part2/00003.png
new file mode 100644
index 00000000..d526f4d7
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part2/00003.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part2/00004.png b/tests/snapshots/stax/test_message_normal/part2/00004.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part2/00004.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00000.png b/tests/snapshots/stax/test_message_normal/part3/00000.png
new file mode 100644
index 00000000..8e091e97
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00000.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00001.png b/tests/snapshots/stax/test_message_normal/part3/00001.png
new file mode 100644
index 00000000..fa343ee5
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00001.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00002.png b/tests/snapshots/stax/test_message_normal/part3/00002.png
new file mode 100644
index 00000000..98af43ea
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00002.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00003.png b/tests/snapshots/stax/test_message_normal/part3/00003.png
new file mode 100644
index 00000000..6b9ca454
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00003.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00004.png b/tests/snapshots/stax/test_message_normal/part3/00004.png
new file mode 100644
index 00000000..cd2f5275
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00004.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part3/00005.png b/tests/snapshots/stax/test_message_normal/part3/00005.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part3/00005.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00000.png b/tests/snapshots/stax/test_message_normal/part4/00000.png
new file mode 100644
index 00000000..8e091e97
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00000.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00001.png b/tests/snapshots/stax/test_message_normal/part4/00001.png
new file mode 100644
index 00000000..dc1361ec
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00001.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00002.png b/tests/snapshots/stax/test_message_normal/part4/00002.png
new file mode 100644
index 00000000..9e4cdb71
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00002.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00003.png b/tests/snapshots/stax/test_message_normal/part4/00003.png
new file mode 100644
index 00000000..6b9ca454
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00003.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00004.png b/tests/snapshots/stax/test_message_normal/part4/00004.png
new file mode 100644
index 00000000..cd2f5275
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00004.png differ
diff --git a/tests/snapshots/stax/test_message_normal/part4/00005.png b/tests/snapshots/stax/test_message_normal/part4/00005.png
new file mode 100644
index 00000000..1dac7479
Binary files /dev/null and b/tests/snapshots/stax/test_message_normal/part4/00005.png differ
diff --git a/tests/test_sign_cmd.py b/tests/test_sign_cmd.py
index 167f1e32..d1b63f88 100644
--- a/tests/test_sign_cmd.py
+++ b/tests/test_sign_cmd.py
@@ -27,6 +27,7 @@ def _check_transaction(
         path: str,
         curve: CurveChoice,
         hash_t: HashType,
+        signable_type: str,
         timeout: int = 300,
 ) -> None:
     """ Check the transaction in confirmation mode when user accepts """
@@ -38,7 +39,7 @@ def _check_transaction(
     message = bytes.fromhex(transaction)
 
     # Send the APDU (Asynchronous)
-    with client.sign_tx(path, curve, message, hash_t):
+    with client.sign_tx(path, curve, message, hash_t, signable_type):
         util_navigate(firmware, navigator, test_name, "APPROVE_SIGN", timeout)
 
     # Send the APDU (Asynchronous)
@@ -48,7 +49,7 @@ def _check_transaction(
     # Parse the response
     _, der_sig = unpack_sign_tx_response(response.data)
     # Check the signature
-    util_check_signature(public_key, der_sig, message, curve, hash_t)
+    util_check_signature(public_key, der_sig, message, curve, hash_t, signable_type)
 
 
 def test_transaction_params(firmware, backend, navigator, test_name):
@@ -78,7 +79,7 @@ def test_transaction_params(firmware, backend, navigator, test_name):
         for curve in curve_list:
             for hash_t in hash_list:
                 part += 1
-                _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t)
+                _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t, "")
 
 
 class Test_EXPERT():
@@ -108,7 +109,7 @@ def test_transaction_expert(self, firmware, backend, navigator, test_name):
         # Send the APDU and check the results
         for cfg in test_cfg:
             part += 1
-            _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, cfg["curve"], cfg["hash"])
+            _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, cfg["curve"], cfg["hash"], "")
 
 
 def test_transaction_slot(firmware, backend, navigator, test_name):
@@ -128,7 +129,7 @@ def test_transaction_slot(firmware, backend, navigator, test_name):
 
     # Send the APDU and check the results
     part = 0
-    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t)
+    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t, "")
 
     # Set slot to correct path correct address,
     part += 1
@@ -136,11 +137,11 @@ def test_transaction_slot(firmware, backend, navigator, test_name):
 
     # Sign the Tx again - incorrect hd path
     part += 1
-    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, bad_path, curve, hash_t)
+    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, bad_path, curve, hash_t, "")
 
     # Sign the Tx again - correct path
     part += 1
-    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t)
+    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t, "")
 
     # e467b9dd11fa00df - used as incorrect address; f8d6e0586b0a20c7 - correct one
     transactions = [
@@ -161,11 +162,11 @@ def test_transaction_slot(firmware, backend, navigator, test_name):
     # Send the APDU and check the results
     for blob in transactions:
         part += 1
-        _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", blob, path, curve, hash_t)
+        _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", blob, path, curve, hash_t, "")
 
     # sign the Tx again - correct path - wrong hash
         part += 1
-    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, bad_hash)
+    _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, bad_hash, "")
 
     # Now delete the slot so that the next test starts in a clean state
     util_set_slot(client, firmware, navigator, test_name, slot)
@@ -186,7 +187,7 @@ def test_transaction_invalid(firmware, backend, navigator, test_name):
 
     # Send the APDU and check the results
     try:
-        _check_transaction(client, firmware, navigator, test_name, transaction, path, curve, hash_t, 5)
+        _check_transaction(client, firmware, navigator, test_name, transaction, path, curve, hash_t, "", 5)
     except TimeoutError:
         pass
 
@@ -292,4 +293,82 @@ def test_transaction_manifest(firmware, backend, navigator, test_name):
     part = 0
     for transaction in transactions:
         part += 1
-        _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t)
+        _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", transaction, path, curve, hash_t, "")
+        
+class Test_MESSAGE():
+    def test_message_normal(self, firmware, backend, navigator, test_name):
+        """ Check message signing, short message """
+
+        # Use the app interface instead of raw interface
+        client = FlowCommandSender(backend)
+        # Test parameters
+        path: str = "m/44'/539'/0'/0/0"
+        test_cfg = [
+            {
+                "curve": CurveChoice.Secp256k1,
+                "hash": HashType.HASH_SHA2,
+                # "This is a nice message that has only displayable characters and is short enough to be displayed"
+                "message": "546869732069732061206e696365206d657373616765207468617420686173206f6e6c7920646973706c617961626c65206368617261637465727320616e642069732073686f727420656e6f75676820746f20626520646973706c61796564"
+            },
+            {
+                "curve": CurveChoice.Secp256k1,
+                "hash": HashType.HASH_SHA2,
+                # Message too long to be displayed normally
+                "message": 1000*"40"
+            },
+            {
+                "curve": CurveChoice.Nist256p1,
+                "hash": HashType.HASH_SHA3,
+                # "This is a nice message that has only displayable characters and is short enough to be displayed"
+                "message": "546869732069732061206e696365206d657373616765207468617420686173206f6e6c7920646973706c617961626c65206368617261637465727320616e642069732073686f727420656e6f75676820746f20626520646973706c61796564"
+            },
+            {
+                "curve": CurveChoice.Secp256k1,
+                "hash": HashType.HASH_SHA2,
+                # Message too long to be displayed normally
+                "message": 1000*"40"
+            },
+        ]
+        
+        part = 0
+
+        # Send the APDU and check the results
+        for i,cfg in enumerate(test_cfg):
+            _check_transaction(client, firmware, navigator, f"{test_name}/part{part}", cfg["message"], path, cfg["curve"], cfg["hash"], "message")
+            part += 1
+            if i == 1:
+                # Navigate in the main menu to change to expert mode          
+                util_set_expert_mode(firmware, navigator, f"{test_name}/part{part}")
+                part += 1
+
+
+    def test_message_invalid(self, firmware, backend, navigator, test_name):
+        """ Check message signing, message with non-displayale character """
+
+        # Use the app interface instead of raw interface
+        client = FlowCommandSender(backend)
+        # Test parameters
+        path: str = "m/44'/539'/0'/0/0"
+        test_cfg = [
+            {
+                "curve": CurveChoice.Secp256k1,
+                "hash": HashType.HASH_SHA2,
+                # Message with non-displayable characters
+                "message": "4d657373616765ee"
+            },
+        ]
+        
+        part = 0
+
+        # Send the APDU and check the results
+        for cfg in test_cfg:
+            # Convert message to bytes
+            message = bytes.fromhex(cfg["message"])
+
+            # Send the APDU (Asynchronous)
+            with pytest.raises(ExceptionRAPDU) as err:
+                with client.sign_tx(path, cfg["curve"], message, cfg["hash"], "message"):
+                    pass
+            assert(str(err) == "<ExceptionInfo ExceptionRAPDU(status=27012, data=b'Invalid message') tblen=8>")
+            part += 1
+
diff --git a/tests/utils.py b/tests/utils.py
index c071d9b1..df7ecce0 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -16,16 +16,24 @@
 
 ROOT_SCREENSHOT_PATH = Path(__file__).parent.resolve()
 TX_DOMAIN_TAG = "FLOW-V0.0-transaction"
+MESSAGE_DOMAIN_TAG = "FLOW-V0.0-user"
 DOMAIN_TAG_LENGTH = 32
 
 
-def _init_header() -> bytes:
+def _init_header(signable_type: str) -> bytes:
     """ Prepare the message Header (DOMAIN_TAG) """
 
-    hdr = TX_DOMAIN_TAG.encode("utf-8").hex()
-    pad_size = DOMAIN_TAG_LENGTH - len(TX_DOMAIN_TAG)
-    hdr += bytearray([0] * pad_size).hex()
-    return bytes.fromhex(hdr)
+    if signable_type == "message":
+        hdr = MESSAGE_DOMAIN_TAG.encode("utf-8").hex()
+        pad_size = DOMAIN_TAG_LENGTH - len(MESSAGE_DOMAIN_TAG)
+        hdr += bytearray([0] * pad_size).hex()
+        return bytes.fromhex(hdr)
+        
+    else:
+        hdr = TX_DOMAIN_TAG.encode("utf-8").hex()
+        pad_size = DOMAIN_TAG_LENGTH - len(TX_DOMAIN_TAG)
+        hdr += bytearray([0] * pad_size).hex()
+        return bytes.fromhex(hdr)
 
 
 def util_check_signature(
@@ -34,6 +42,7 @@ def util_check_signature(
         message: bytes,
         curve: CurveChoice,
         hash_t: HashType,
+        signable_type: str
 ) -> bool:
     """ Check if the signature of a given message is valid """
 
@@ -57,7 +66,7 @@ def util_check_signature(
     key: VerifyingKey = VerifyingKey.from_string(public_key, ec_curve, hashfunc)
 
     # Prepare the message Header (DOMAIN_TAG)
-    data = _init_header() + message
+    data = _init_header(signable_type) + message
 
     assert key.verify(signature, data, hashfunc, sigdecode_der)