2 files changed, 11 insertions, 2 deletions
diff --git a/src/message/builder/cc.cpp b/src/message/builder/cc.cpp
index 55d70ff..9863abf 100644
--- a/src/message/builder/cc.cpp
+++ b/src/message/builder/cc.cpp
@@ -21,11 +21,19 @@ namespace smtp::message::builder
             return result;
         }
 
-        for(const auto& cc : mMailTo)
+        for( const auto& cc : mMailTo )
         {
-            result += "Cc: " + cc + "\r\n";
+            if( !IsFirstElement( cc ) )
+            {
+                result += "Cc: " + cc + "\r\n";
+            }
         }
 
         return result;
     }
+
+    bool Cc::IsFirstElement( std::string const& cc ) const
+    {
+        return cc == mMailTo.front();
+    }
 }
diff --git a/src/message/builder/cc.hpp b/src/message/builder/cc.hpp
index 340c7cd..a06b374 100644
--- a/src/message/builder/cc.hpp
+++ b/src/message/builder/cc.hpp
@@ -15,6 +15,7 @@ namespace smtp::message::builder
 
         std::string Get() const override;
     private:
+        bool IsFirstElement( std::string const& cc ) const;
         std::list<std::string> const& mMailTo;
     };
 }