diff -r bf7eb7911fc5 -r 997a02608b3a emailservices/nmclientapi/src/nmapimessageenvelope.cpp
--- a/emailservices/nmclientapi/src/nmapimessageenvelope.cpp	Wed Jun 23 18:00:21 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapimessageenvelope.cpp	Tue Jul 06 14:04:34 2010 +0300
@@ -15,16 +15,9 @@
  *
  */
 
-#include "emailtrace.h"
-
-#include <QString>
-#include <QDateTime>
+#include "nmapiheaders.h"
 
-#include <nmapimessageenvelope.h>
-#include "nmapimessageenvelope_p.h"
 
-#include <nmapiemailaddress.h>
-#include <nmapimessagebody.h>
 
 namespace EmailClientApi
 {