diff -Naur mahogany-0.67.cvs/include/Mcommon.h mahogany-0.67.buildfix/include/Mcommon.h
--- mahogany-0.67.cvs/include/Mcommon.h	2006-01-16 21:32:01.000000000 +0100
+++ mahogany-0.67.buildfix/include/Mcommon.h	2007-05-08 15:36:50.000000000 +0200
@@ -149,9 +149,9 @@
 */
 #   define   PY_CALLBACKVA(arg,default)            PythonCallback arg
 #else
-#   define   PY_CALLBACK(name, profile, default)   PythonCallback((int)default)
-    inline int PythonCallback(int def) { return def; }
-#   define   PY_CALLBACKVA(arg,default)      PythonCallback((int)default)
+#   define   PY_CALLBACK(name, profile, default)  PythonCallback((long)default)
+    inline long PythonCallback(long def) { return def; }
+#   define   PY_CALLBACKVA(arg,default)      PythonCallback((long)default)
 #endif
 //@}
 
diff -Naur mahogany-0.67.cvs/include/MPython.h mahogany-0.67.buildfix/include/MPython.h
--- mahogany-0.67.cvs/include/MPython.h	2006-03-30 04:22:19.000000000 +0200
+++ mahogany-0.67.buildfix/include/MPython.h	2007-05-08 15:24:27.000000000 +0200
@@ -131,6 +131,7 @@
    M_PY_VAR_DECL(PyTypeObject *, PyInstance_Type);
 
    // ints and longs
+   M_PY_WRAPPER_DECL(PyObject *, PyBool_FromLong, (long));
    M_PY_WRAPPER_DECL(long, PyInt_AsLong, (PyObject *));
    M_PY_WRAPPER_DECL(PyObject*, PyInt_FromLong, (long));
    M_PY_WRAPPER_DECL(PyObject *, PyLong_FromUnsignedLong, (unsigned long));
@@ -278,6 +279,7 @@
 #define PyInstance_Type (*M_PyInstance_Type)
 
 // ints and longs
+#define PyBool_FromLong M_PyBool_FromLong
 #define PyInt_AsLong M_PyInt_AsLong
 #define PyInt_FromLong M_PyInt_FromLong
 #define PyLong_FromUnsignedLong M_PyLong_FromUnsignedLong
diff -Naur mahogany-0.67.cvs/src/classes/MessageView.cpp mahogany-0.67.buildfix/src/classes/MessageView.cpp
--- mahogany-0.67.cvs/src/classes/MessageView.cpp	2007-05-08 15:17:01.000000000 +0200
+++ mahogany-0.67.buildfix/src/classes/MessageView.cpp	2007-05-08 15:27:43.000000000 +0200
@@ -2454,7 +2454,7 @@
    CHECK( !cidOrig.empty(), false, "empty CID not allowed" );
 
    String cid;
-   if ( *cidOrig.begin() == '<' && *cidOrig.rbegin() == '>' )
+   if ( *cidOrig.begin() == '<' && cidOrig.length() == '>' )
       cid.assign(cidOrig, 1, cidOrig.length() - 2);
    else
       cid = cidOrig;
diff -Naur mahogany-0.67.cvs/src/Python/PythonDll.cpp mahogany-0.67.buildfix/src/Python/PythonDll.cpp
--- mahogany-0.67.cvs/src/Python/PythonDll.cpp	2006-04-08 03:28:50.000000000 +0200
+++ mahogany-0.67.buildfix/src/Python/PythonDll.cpp	2007-05-08 15:25:58.000000000 +0200
@@ -109,6 +109,7 @@
    M_PY_VAR_DEF(PyInstance_Type);
 
    // ints and longs
+   M_PY_WRAPPER_DEF(PyBool_FromLong);
    M_PY_WRAPPER_DEF(PyInt_AsLong);
    M_PY_WRAPPER_DEF(PyInt_FromLong);
    M_PY_WRAPPER_DEF(PyLong_FromUnsignedLong);
@@ -270,6 +271,7 @@
    PYTHON_SYMBOL(_PyInstance_Lookup)
 
    // ints and longs
+   PYTHON_SYMBOL(PyBool_FromLong)
    PYTHON_SYMBOL(PyInt_AsLong)
    PYTHON_SYMBOL(PyInt_FromLong)
    PYTHON_SYMBOL(PyLong_FromUnsignedLong)