7 files changed, 5 insertions, 7 deletions
diff --git a/mimelib/mimelib/address.h b/mimelib/mimelib/address.h
index c384b949..7ed56ba8 100644
--- a/mimelib/mimelib/address.h
+++ b/mimelib/mimelib/address.h
@@ -36,7 +36,6 @@
 #endif
 
 class DwAddressList;
-class DwMailboxList;
 
 //=============================================================================
 //+ Name DwAddress -- Abstract class representing an RFC-822 address
@@ -149,7 +148,7 @@ protected:
 
 inline DwBool DwAddress::IsValid() const
 {
-    return mIsValid;
+    return mIsValid != 0;
 }
 
 #endif
diff --git a/mimelib/mimelib/enum.h b/mimelib/mimelib/enum.h
index 9e2d0ee3..93cfe010 100644
--- a/mimelib/mimelib/enum.h
+++ b/mimelib/mimelib/enum.h
@@ -78,6 +78,7 @@ enum {
     kSubtypeEnriched,
     kSubtypeHtml,
     kSubtypeXVCard,
+    kSubtypeDirectory,
     kSubtypeVCal,
     kSubtypeRtf,
     kSubtypeXDiff,
diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h
index 8f802ce5..f545a3db 100644
--- a/mimelib/mimelib/headers.h
+++ b/mimelib/mimelib/headers.h
@@ -67,7 +67,6 @@
 #endif
 
 class DwMessage;
-class DwBodyPart;
 class DwField;
 class DwFieldBody;
 class DwDateTime;
diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h
index d5d376f2..7e38ae4b 100644
--- a/mimelib/mimelib/mailbox.h
+++ b/mimelib/mimelib/mailbox.h
@@ -35,7 +35,6 @@
 #include <mimelib/address.h>
 #endif
 
-class DwGroup;
 
 //=============================================================================
 //+ Name DwMailbox -- Class representing an RFC-822 mailbox
diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h
index 0487d751..723a8c55 100644
--- a/mimelib/mimelib/mboxlist.h
+++ b/mimelib/mimelib/mboxlist.h
@@ -35,7 +35,6 @@
 #include <mimelib/address.h>
 #endif
 
-class DwGroup;
 
 
 //=============================================================================
diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h
index f1b28495..c9e6707e 100644
--- a/mimelib/mimelib/msgcmp.h
+++ b/mimelib/mimelib/msgcmp.h
@@ -256,8 +256,8 @@ public:
     //. Returns a object id that is unique among all DwMessageComponent
     //. objects.
 
-    const char* partId() const { return mId.c_str(); };
-    void SetPartId( DwString id ) { mId = id; };
+    const char* partId() const { return mId.c_str(); }
+    void SetPartId( DwString id ) { mId = id; }
     // set or get a unique string for that part
 
 protected:
diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h
index 151a68c5..32186a82 100644
--- a/mimelib/mimelib/protocol.h
+++ b/mimelib/mimelib/protocol.h
@@ -38,6 +38,7 @@
 
 class DwObserver {
 public:
+	virtual ~DwObserver(){}
     virtual void Notify()=0;
 };