diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 3b9bcab6cd..3b7f478fd4 100644
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -36,6 +36,8 @@ public:
     // ctor loads all info into memory for quicker access later on
     // TODO it would be nice to load them all, but parse on demand only...
     wxMimeTypesManagerImpl();
+    ~wxMimeTypesManagerImpl();
+    
 
     // implement containing class functions
     wxFileType *GetFileTypeFromExtension(const wxString& ext);
diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 3e74741551..fb55217c0c 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -138,6 +138,11 @@ public:
     {
         m_next = NULL;
     }
+    
+    ~MailCapEntry()
+    {
+        if (m_next) delete m_next;
+    }
 
     // accessors
     const wxString& GetOpenCmd()  const { return m_openCmd;  }
@@ -1041,6 +1046,14 @@ wxMimeTypesManagerImpl::wxMimeTypesManagerImpl()
         handlers[hn]->GetMimeInfoRecords(this);
 }
 
+
+wxMimeTypesManagerImpl::~wxMimeTypesManagerImpl()
+{
+    size_t cnt = m_aEntries.GetCount();
+    for (size_t i = 0; i < cnt; i++) delete m_aEntries[i];
+}
+
+
 wxFileType *
 wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
 {