diff --git a/ChangeLog b/ChangeLog
index 294050e3..0c2c7c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 VERSION 0.7.1cvs
 ================
 
+2005-06-03  Vincent Richard  <vincent@vincent-richard.net>
+
+ * parameterizedHeaderField.{hpp|cpp}: fixed a memory leak in the
+   destructor (thanks to Rafael Fernandez).
+
 2005-05-27  Vincent Richard  <vincent@vincent-richard.net>
 
  * messaging/*/*Message.{hpp|cpp}: added a 'peek' parameter to extract
diff --git a/src/parameterizedHeaderField.cpp b/src/parameterizedHeaderField.cpp
index d3c8f67c..6e5e47ad 100644
--- a/src/parameterizedHeaderField.cpp
+++ b/src/parameterizedHeaderField.cpp
@@ -32,6 +32,12 @@ parameterizedHeaderField::parameterizedHeaderField()
 }
 
 
+parameterizedHeaderField::~parameterizedHeaderField()
+{
+	removeAllParameters();
+}
+
+
 /*
      This class handles field contents of the following form:
      Field: VALUE; PARAM1="VALUE1"; PARAM2="VALUE2"...
diff --git a/vmime/parameterizedHeaderField.hpp b/vmime/parameterizedHeaderField.hpp
index ec85b766..02645eb8 100644
--- a/vmime/parameterizedHeaderField.hpp
+++ b/vmime/parameterizedHeaderField.hpp
@@ -46,6 +46,8 @@ protected:
 
 public:
 
+	~parameterizedHeaderField();
+
 	void copyFrom(const component& other);
 	parameterizedHeaderField& operator=(const parameterizedHeaderField& other);