diff --git a/src/cpp/Attachment.cpp b/src/cpp/Attachment.cpp
index fdc1ae2..4556162 100644
--- a/src/cpp/Attachment.cpp
+++ b/src/cpp/Attachment.cpp
@@ -65,7 +65,7 @@ const string Attachment::ALTERNATIVE			("alternative");
 const string Attachment::KAZ_ATTACH_NAME		("vos-pieces-jointes-kaz-ici.htm");
 const string Attachment::MULTIPART			("multipart/");
 
-const regex Attachment::nameCharsetRegEx		(".*name\\*=\\s*([; \t]*)");
+const regex Attachment::nameCharsetRegEx		( ".*name\\*=\\s*([; \t]*)");
 const regex Attachment::nameRegEx			(    ".*name=\\s*((\"(\\\\.|[^\\\\])*\")|[^; \t]*).*");
 const regex Attachment::boundaryRegEx			(".*boundary=\\s*((\"(\\\\.|[^\\\\])*\")|[^; \t]*).*");
 const regex Attachment::cidDefRegEx			(".*<([^>]*)>.*");
diff --git a/src/cpp/MainAttachment.cpp b/src/cpp/MainAttachment.cpp
index 77188be..4637dd8 100644
--- a/src/cpp/MainAttachment.cpp
+++ b/src/cpp/MainAttachment.cpp
@@ -349,7 +349,7 @@ MainAttachment::extractLinks (const string &extractedPlainKAZ) {
     string name;
 
     if (startName != string::npos) {
-      name = string (extractedPlainKAZ, startName+3, stopName - startName - 3);
+      name = string (extractedPlainKAZ, startName+2, stopName -startName-2);
       // skip [> \r\n\t]
       string::size_type nextPos = name.find_first_not_of ("[>< \t\r\n\"]");
       if (nextPos != string::npos)