diff --git a/messagecomposer/CMakeLists.txt b/messagecomposer/CMakeLists.txt
index ab5cf7ac0..78e449776 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@ -1,49 +1,49 @@
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
 add_subdirectory( tests )
 
 set( messagecomposer_src
 
      composer.cpp
      behaviour.cpp
      attachmentpart.cpp
      finalmessage.cpp
      infopart.cpp
      messagepart.cpp
      skeletonmessagejob.cpp
      textpart.cpp
 
      job.cpp
      contentjob.cpp
      maintextjob.cpp
      multipartjob.cpp
 )
 
 include_directories(
-    ${Boost_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIR}
 )
 
 kde4_add_library( messagecomposer SHARED ${messagecomposer_src} )
 target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} kmime )
 set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
 install( TARGETS messagecomposer EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES
          messagecomposer_export.h
           
          composer.h
          behaviour.h
          attachmentpart.h
          finalmessage.h
          infopart.h
          messagepart.h
          skeletonmessagejob.h
          textpart.h
 
          job.h
          contentjob.h
          maintextjob.h
          multipartjob.h
 
          DESTINATION ${INCLUDE_INSTALL_DIR}/messagecomposer COMPONENT Devel )
 
diff --git a/messagecomposer/tests/CMakeLists.txt b/messagecomposer/tests/CMakeLists.txt
index a6cafe490..8de129602 100644
--- a/messagecomposer/tests/CMakeLists.txt
+++ b/messagecomposer/tests/CMakeLists.txt
@@ -1,22 +1,26 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
+include_directories (
+    ${Boost_INCLUDE_DIR}
+)
+
 # convenience macro to add messagecomposer unit tests
 macro( add_messagecomposer_test _source )
   set( _test ${_source} )
   get_filename_component( _name ${_source} NAME_WE )
   kde4_add_unit_test( ${_name} TESTNAME messagecomposer-${_name} ${_test} )
   target_link_libraries( ${_name} kmime messagecomposer ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} )
 endmacro( add_messagecomposer_test )
 
 
 # Utility stuff.
 add_messagecomposer_test( behaviourtest.cpp )
 
 # Basic jobs.
 add_messagecomposer_test( contentjobtest.cpp )
 add_messagecomposer_test( multipartjobtest.cpp )
 
 # More complex jobs.
 add_messagecomposer_test( skeletonmessagejobtest.cpp )
 
 # Composer.