diff --git a/__tests__/files/gmail-gmail/README.md b/__tests__/files/gmail-gmail/README.md
index d9d69808e9b8333dd5821ec2afeb633c010cb2c5..4dc5dbe5a7c58d1e988d059c8a7430388cfc36b3 100644
--- a/__tests__/files/gmail-gmail/README.md
+++ b/__tests__/files/gmail-gmail/README.md
@@ -42,4 +42,9 @@
 | 17          | Complex text on multiple lines with embedded html, embed one picture, attach one binary and one text file             | ok                |
 | 18          | Complex text on multiple lines with embedded html, mixture of embedded pictures, attached binary files and text files | ok                |
 | 19          | Simple text, one Gdrive file                                                                                          | ok                |
-| 20          | Complex text Gdrive file, binary file and embedded picture.                                                           | ok                |
\ No newline at end of file
+| 20          | Complex text Gdrive file, binary file and embedded picture.                                                           | ok                |
+| 21          | Send a second email as reply with the same sender                                                                     | fail              |
+|             |	                                                                                                                      |                   |
+|             |                                                                                                                       |                   |
+|             | Forward                                                                                                               |                   |
+| 1           | Simple text, no attachments                                                                                           | fail              |
diff --git a/__tests__/files/gmail-gmail/one/21/r_htmlContent.html b/__tests__/files/gmail-gmail/one/21/r_htmlContent.html
new file mode 100644
index 0000000000000000000000000000000000000000..a2ee3ed1cf8bff4be86974899ac260c7586b91df
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/21/r_htmlContent.html
@@ -0,0 +1,3 @@
+<div dir="ltr"><br>Forwarding an email with history.<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>From: <strong class="gmail_sendername" dir="auto">Rosen Georgiev</strong> <span dir="auto">&lt;<a href="mailto:rosenkirchev@gmail.com">rosenkirchev@gmail.com</a>&gt;</span><br>Date: Fri, Dec 11, 2020 at 11:48 AM<br>Subject: test 123<br>To:  &lt;<a href="mailto:rosenvereign@gmail.com">rosenvereign@gmail.com</a>&gt;<br></div><br><br><div dir="ltr"><br>test 123<br><a href="https://gmail.test.vereign.com/?q=CiCmv1km3XHq88gSQqKAJks6cjqJT9REU6092ANxbXdWFRIg41MUcRa9szrNE_Uzk2mg0oaERcNsEyt2zbELns2nyuQ=&amp;timestamp=1607680132583" id="m_-6319369610188194273vereignWrapperLink" target="_blank"><img src="cid:ii_kik38q6m0" alt="qrcode.png" width="153" height="230"></a></div>
+</div><br><a href="https://gmail.test.vereign.com/?q=CiD_af1bRp3Lr0VN7XCjr21NhG_sBlsJvujutgLw-NVlGRIgV_8SkcSyAOg15y3-_XauPmzF-mbK48azNaiRmfnpvtk=&amp;timestamp=1607680317560" id="vereignWrapperLink"><img src="cid:ii_kik3coos1" alt="qrcode.png" width="153" height="230"></a></div>
+
diff --git a/__tests__/files/gmail-gmail/one/21/r_plainContent.data b/__tests__/files/gmail-gmail/one/21/r_plainContent.data
new file mode 100644
index 0000000000000000000000000000000000000000..56079a98ed2debb076e324c75dafa428f304ed0b
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/21/r_plainContent.data
@@ -0,0 +1,17 @@
+Forwarding an email with history.
+
+---------- Forwarded message ---------
+From: Rosen Georgiev <rosenkirchev@gmail.com>
+Date: Fri, Dec 11, 2020 at 11:48 AM
+Subject: test 123
+To: <rosenvereign@gmail.com>
+
+
+
+test 123
+[image: qrcode.png]
+<https://gmail.test.vereign.com/?q=CiCmv1km3XHq88gSQqKAJks6cjqJT9REU6092ANxbXdWFRIg41MUcRa9szrNE_Uzk2mg0oaERcNsEyt2zbELns2nyuQ=&timestamp=1607680132583>
+
+[image: qrcode.png]
+<https://gmail.test.vereign.com/?q=CiD_af1bRp3Lr0VN7XCjr21NhG_sBlsJvujutgLw-NVlGRIgV_8SkcSyAOg15y3-_XauPmzF-mbK48azNaiRmfnpvtk=&timestamp=1607680317560>
+
diff --git a/__tests__/files/gmail-gmail/one/21/s_htmlContent.html b/__tests__/files/gmail-gmail/one/21/s_htmlContent.html
new file mode 100644
index 0000000000000000000000000000000000000000..7bf32b2da3ab06c3e78bca302f3845126498315f
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/21/s_htmlContent.html
@@ -0,0 +1 @@
+<div dir="ltr">Forwarding an email with history.<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>From: <strong class="gmail_sendername" dir="auto">Rosen Georgiev</strong><span dir="auto">&lt;<a href="mailto:rosenkirchev@gmail.com">rosenkirchev@gmail.com</a>&gt;</span><br>Date: Fri, Dec 11, 2020 at 11:48 AM<br>Subject: test 123<br>To:  &lt;<a href="mailto:rosenvereign@gmail.com">rosenvereign@gmail.com</a>&gt;<br></div><br><br><div dir="ltr"><br>test 123<br><a href="https://gmail.test.vereign.com/?q=CiCmv1km3XHq88gSQqKAJks6cjqJT9REU6092ANxbXdWFRIg41MUcRa9szrNE_Uzk2mg0oaERcNsEyt2zbELns2nyuQ=&amp;timestamp=1607680132583" id="m_-6319369610188194273vereignWrapperLink" target="_blank"><img src="cid:ii_kik38q6m0" alt="qrcode.png" width="153" height="230" data-surl="cid:ii_kik38q6m0"></a></div></div></div>
diff --git a/__tests__/files/gmail-gmail/one/21/s_plainContent.data b/__tests__/files/gmail-gmail/one/21/s_plainContent.data
new file mode 100644
index 0000000000000000000000000000000000000000..3d355920562ffd96f5f122b1a7715e362c23e016
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/21/s_plainContent.data
@@ -0,0 +1,13 @@
+Forwarding an email with history.
+
+---------- Forwarded message ---------
+From: Rosen Georgiev <rosenkirchev@gmail.com>
+Date: Fri, Dec 11, 2020 at 11:48 AM
+Subject: test 123
+To: <rosenvereign@gmail.com>
+
+
+
+test 123
+[image: qrcode.png] 
+<https://gmail.test.vereign.com/?q=CiCmv1km3XHq88gSQqKAJks6cjqJT9REU6092ANxbXdWFRIg41MUcRa9szrNE_Uzk2mg0oaERcNsEyt2zbELns2nyuQ=&timestamp=1607680132583>
diff --git a/__tests__/files/gmail-gmail/one/22/r_htmlContent.html b/__tests__/files/gmail-gmail/one/22/r_htmlContent.html
new file mode 100644
index 0000000000000000000000000000000000000000..a40d8e3728d3327e14d69194d17d22cbbeb76735
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/22/r_htmlContent.html
@@ -0,0 +1,2 @@
+<div dir="ltr"><br>reply second email to all<br><a href="https://gmail.test.vereign.com/?q=CiA9KpFulwecbra-Vzakr6t3kGPTJ2uK4JQ91KlzUGJRRhIgK4-brXpuJcszaNGljeunMlWUv5IYmujPBaBRyB3zWL8=&amp;timestamp=1607695422416" id="vereignWrapperLink"><img src="cid:ii_kikccfmt1" alt="qrcode.png" width="153" height="230"></a></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Dec 11, 2020 at 3:55 PM Rosen Georgiev &lt;<a href="mailto:rosenkirchev@gmail.com">rosenkirchev@gmail.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br>multiple recipients<br><a href="https://gmail.test.vereign.com/?q=CiDvUAtuwEqSqs8bzF92OF4rTkJG3jt19AV3vGsh12aGfBIg_N4I9OD2jbSdQJGC8ATfPfemwfxcQyE66gUtrCECppk=&amp;timestamp=1607694903364" id="gmail-m_5893169313940791883vereignWrapperLink" target="_blank"><img src="cid:ii_kikc1b5f0" alt="qrcode.png" width="153" height="230"></a></div>
+</blockquote></div>
\ No newline at end of file
diff --git a/__tests__/files/gmail-gmail/one/22/r_plainContent.data b/__tests__/files/gmail-gmail/one/22/r_plainContent.data
new file mode 100644
index 0000000000000000000000000000000000000000..cf147035a860680341dfab2ef815286eb09a75e2
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/22/r_plainContent.data
@@ -0,0 +1,12 @@
+reply second email to all
+[image: qrcode.png]
+<https://gmail.test.vereign.com/?q=CiA9KpFulwecbra-Vzakr6t3kGPTJ2uK4JQ91KlzUGJRRhIgK4-brXpuJcszaNGljeunMlWUv5IYmujPBaBRyB3zWL8=&timestamp=1607695422416>
+
+On Fri, Dec 11, 2020 at 3:55 PM Rosen Georgiev <rosenkirchev@gmail.com>
+wrote:
+
+>
+> multiple recipients
+> [image: qrcode.png]
+> <https://gmail.test.vereign.com/?q=CiDvUAtuwEqSqs8bzF92OF4rTkJG3jt19AV3vGsh12aGfBIg_N4I9OD2jbSdQJGC8ATfPfemwfxcQyE66gUtrCECppk=&timestamp=1607694903364>
+>
\ No newline at end of file
diff --git a/__tests__/files/gmail-gmail/one/22/s_htmlContent.html b/__tests__/files/gmail-gmail/one/22/s_htmlContent.html
new file mode 100644
index 0000000000000000000000000000000000000000..3482ae89e9577b66381fe17bf7f0b4da9e6efa7a
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/22/s_htmlContent.html
@@ -0,0 +1 @@
+<div dir="ltr">reply second email to all</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Dec 11, 2020 at 3:55 PM Rosen Georgiev &lt;<a href="mailto:rosenkirchev@gmail.com">rosenkirchev@gmail.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><br>multiple recipients<br><a href="https://gmail.test.vereign.com/?q=CiDvUAtuwEqSqs8bzF92OF4rTkJG3jt19AV3vGsh12aGfBIg_N4I9OD2jbSdQJGC8ATfPfemwfxcQyE66gUtrCECppk=&amp;timestamp=1607694903364" id="gmail-m_5893169313940791883vereignWrapperLink" target="_blank"><img src="cid:ii_kikc1b5f0" alt="qrcode.png" width="153" height="230" data-surl="cid:ii_kikc1b5f0"></a></div></blockquote></div>
\ No newline at end of file
diff --git a/__tests__/files/gmail-gmail/one/22/s_plainContent.data b/__tests__/files/gmail-gmail/one/22/s_plainContent.data
new file mode 100644
index 0000000000000000000000000000000000000000..a8735318364231b53f83abac6c69ffb23c2c3664
--- /dev/null
+++ b/__tests__/files/gmail-gmail/one/22/s_plainContent.data
@@ -0,0 +1,11 @@
+reply second email to all
+
+On Fri, Dec 11, 2020 at 3:55 PM Rosen Georgiev <rosenkirchev@gmail.com> 
+wrote:
+
+>
+> multiple recipients
+> [image: qrcode.png] 
+> <https://gmail.test.vereign.com/?q=CiDvUAtuwEqSqs8bzF92OF4rTkJG3jt19AV3vGsh12aGfBIg_N4I9OD2jbSdQJGC8ATfPfemwfxcQyE66gUtrCECppk=&timestamp=1607694903364>
+>
+