diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp
index d71ecae6..67d919ec 100644
--- a/vmime/net/imap/IMAPParser.hpp
+++ b/vmime/net/imap/IMAPParser.hpp
@@ -3188,6 +3188,16 @@ public:
 	{
 	public:
 
+		media_message()
+			: m_media_subtype(NULL)
+		{
+		}
+
+		~media_message()
+		{
+			delete m_media_subtype;
+		}
+
 		void go(IMAPParser& parser, string& line, string::size_type* currentPos)
 		{
 			DEBUG_ENTER_COMPONENT("media_message");
@@ -4338,6 +4348,12 @@ public:
 			{
 				delete (*it);
 			}
+
+			for (std::vector <status_info*>::iterator it = m_status_info_list.begin() ;
+			     it != m_status_info_list.end() ; ++it)
+			{
+				delete (*it);
+			}
 		}
 
 		void go(IMAPParser& parser, string& line, string::size_type* currentPos)