diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 99b3c7e1ff..cba09a3d1b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-16 01:26 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbwin/mapi.c
+    ! fixed compilation with OpenWatcom
+
 2009-12-16 01:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     ! Typo in prev entry.
diff --git a/harbour/contrib/hbwin/mapi.c b/harbour/contrib/hbwin/mapi.c
index 067e0827ac..053b5310f8 100644
--- a/harbour/contrib/hbwin/mapi.c
+++ b/harbour/contrib/hbwin/mapi.c
@@ -59,7 +59,19 @@
 #include <mapi.h>
 
 #if ! defined( MAPI_UNICODE )
-   #define MAPI_UNICODE   ( ( ULONG ) 0x80000000 )
+#  define MAPI_UNICODE   ( ( ULONG ) 0x80000000 )
+#endif
+
+#if !defined( MAPI_RECEIPT_REQUESTED )
+#  if defined( MAPI_RECIPIENT_REQUESTED )
+#     define MAPI_RECEIPT_REQUESTED MAPI_RECIPIENT_REQUESTED
+#  else
+#     define MAPI_RECEIPT_REQUESTED 0x00000002L
+#  endif
+#endif
+
+#if defined( __WATCOMC__ )
+typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG);
 #endif
 
 HB_FUNC( WIN_MAPISENDMAIL )