88 files changed, 12072 insertions, 0 deletions
diff --git a/ext/imap/CREDITS b/ext/imap/CREDITS
new file mode 100644
index 0000000..2d19ecd
--- /dev/null
+++ b/ext/imap/CREDITS
@@ -0,0 +1,2 @@
+IMAP
+Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky
diff --git a/ext/imap/IMAP_Win32_HOWTO.txt b/ext/imap/IMAP_Win32_HOWTO.txt
new file mode 100644
index 0000000..5fbd859
--- /dev/null
+++ b/ext/imap/IMAP_Win32_HOWTO.txt
@@ -0,0 +1,32 @@
+Rules for building IMAP
+-----------------------
+
+Note 1:  You *must* use NT's cmd.exe for this job;  4NT.exe will NOT work properly.
+Note 2:  During the entire build process, you can ignore warnings about
+         inconsistent DLL linkage.
+
+- Open IMAP under php_build.  Rename this directory to 'IMAP'.
+- Change to the IMAP directory.
+- Edit .\src\osdep\nt\makefile.nt:
+  Search for '/MT', and change it to '/MD'.  If you're compiling in DEBUG mode,
+  use '/MDd' instead.
+  Search for 'ERASE'.  Comment out the line that contains the ERASE command.
+- Run 'nmake nt'
+
+---Begin Win2K only---
+- At some point, the build will fail.  Rerun 'nmake nt'.
+- After a while, the build will fail again, failing to find auths.c.
+- Change directory to 'c-client'
+- Create an a file named auths.c, that includes the following line:
+  #include "auth_md5.c"
+- Run 'nmake -f makefile.nt'
+---End Win2K only---
+
+At this point (even if the last build apparently failed), you should have the
+client library ready (cclient.lib).
+
+Start Visual Studio, load php_modules.dsw, select the IMAP projects, and build
+it.
+
+
+  
+\ No newline at end of file
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
new file mode 100644
index 0000000..3ad7c10
--- /dev/null
+++ b/ext/imap/config.m4
@@ -0,0 +1,278 @@
+dnl
+dnl $Id$
+dnl
+
+AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
+    AC_DEFINE(HAVE_IMAP2000, 1, [ ])
+    IMAP_DIR=$i
+    IMAP_INC_DIR=$i$1
+    break
+  elif test -r "$i$1/rfc822.h"; then 
+    IMAP_DIR=$i; 
+    IMAP_INC_DIR=$i$1
+	break
+])
+
+AC_DEFUN([IMAP_LIB_CHK],[
+  str="$IMAP_DIR/$1/lib$lib.*"
+  for i in `echo $str`; do
+    test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
+  done
+])
+
+dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok, extra-libs)
+AC_DEFUN([PHP_IMAP_TEST_BUILD], [
+  PHP_TEST_BUILD([$1], [$2], [$3], [$4],
+  [
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+    PHP_IMAP_EXPORT void mm_log(void){}
+    PHP_IMAP_EXPORT void mm_dlog(void){}
+    PHP_IMAP_EXPORT void mm_flags(void){}
+    PHP_IMAP_EXPORT void mm_fatal(void){}
+    PHP_IMAP_EXPORT void mm_critical(void){}
+    PHP_IMAP_EXPORT void mm_nocritical(void){}
+    PHP_IMAP_EXPORT void mm_notify(void){}
+    PHP_IMAP_EXPORT void mm_login(void){}
+    PHP_IMAP_EXPORT void mm_diskerror(void){}
+    PHP_IMAP_EXPORT void mm_status(void){}
+    PHP_IMAP_EXPORT void mm_lsub(void){}
+    PHP_IMAP_EXPORT void mm_list(void){}
+    PHP_IMAP_EXPORT void mm_exists(void){}
+    PHP_IMAP_EXPORT void mm_searched(void){}
+    PHP_IMAP_EXPORT void mm_expunged(void){}
+  ])
+])
+
+AC_DEFUN([PHP_IMAP_KRB_CHK], [
+  if test "$PHP_KERBEROS" != "no"; then
+    PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
+    [
+      AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
+    ], [
+      AC_MSG_ERROR([Kerberos libraries not found. 
+      
+      Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
+      ])
+    ])
+  else
+    AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
+      AC_MSG_ERROR([This c-client library is built with Kerberos support. 
+
+      Add --with-kerberos to your configure line. Check config.log for details.
+      ])
+    ])
+  fi
+])
+
+AC_DEFUN([PHP_IMAP_SSL_CHK], [
+  if test "$PHP_IMAP_SSL" != "no"; then
+    if test "$PHP_OPENSSL" = ""; then
+      PHP_OPENSSL='no'
+    fi
+    PHP_SETUP_OPENSSL(IMAP_SHARED_LIBADD,
+    [
+      AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
+    ], [
+      AC_MSG_ERROR([OpenSSL libraries not found. 
+      
+      Check the path given to --with-openssl-dir and output in config.log)
+      ])
+    ])
+  elif test -f "$IMAP_INC_DIR/linkage.c"; then
+    AC_EGREP_HEADER(ssl_onceonlyinit, $IMAP_INC_DIR/linkage.c, [
+      AC_MSG_ERROR([This c-client library is built with SSL support. 
+
+      Add --with-imap-ssl to your configure line. Check config.log for details.
+      ])
+    ])
+  fi
+])
+
+
+PHP_ARG_WITH(imap,for IMAP support,
+[  --with-imap[=DIR]       Include IMAP support. DIR is the c-client install prefix])
+
+PHP_ARG_WITH(kerberos,for IMAP Kerberos support,
+[  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install prefix], no, no)
+
+PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
+[  --with-imap-ssl[=DIR]     IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
+
+
+if test "$PHP_IMAP" != "no"; then  
+    PHP_SUBST(IMAP_SHARED_LIBADD)
+    PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
+    AC_DEFINE(HAVE_IMAP,1,[ ])
+
+    for i in $PHP_IMAP /usr/local /usr; do
+      IMAP_INC_CHK()
+      el[]IMAP_INC_CHK(/include/c-client)
+      el[]IMAP_INC_CHK(/include/imap)
+      el[]IMAP_INC_CHK(/include)
+      el[]IMAP_INC_CHK(/imap)
+      el[]IMAP_INC_CHK(/c-client)
+      fi
+    done
+
+    dnl Check for c-client version 2004
+    AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
+      AC_DEFINE(HAVE_IMAP2004,1,[ ])
+    ])
+
+    dnl Check for new version of the utf8_mime2text() function
+    old_CFLAGS=$CFLAGS
+    CFLAGS="-I$IMAP_INC_DIR"
+    AC_CACHE_CHECK(for utf8_mime2text signature, ac_cv_utf8_mime2text,
+      AC_TRY_COMPILE([
+#include <stdio.h>
+#include <c-client.h>
+      ],[
+        SIZEDTEXT *src, *dst;
+        utf8_mime2text(src, dst);
+      ],[
+        ac_cv_utf8_mime2text=old
+      ],[
+        ac_cv_utf8_mime2text=new
+      ])
+    )
+    if test "$ac_cv_utf8_mime2text" = "new"; then
+      AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new signature])
+    fi
+    CFLAGS=$old_CFLAGS
+
+    old_CFLAGS=$CFLAGS
+    CFLAGS="-I$IMAP_INC_DIR"
+    AC_CACHE_CHECK(for U8T_DECOMPOSE, ac_cv_u8t_canonical,
+      AC_TRY_COMPILE([
+#include <c-client.h>
+      ],[
+         int i = U8T_CANONICAL;
+      ],[
+         ac_cv_u8t_decompose=yes
+      ],[
+         ac_cv_u8t_decompose=no
+      ])
+    )
+    CFLAGS=$old_CFLAGS
+
+    if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
+		AC_MSG_ERROR([utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information.])
+    fi
+    if test "$ac_cv_u8t_decompose" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then
+		AC_MSG_ERROR([utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information.])
+    fi
+
+    dnl Check for c-client version 2001
+    old_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS=-I$IMAP_INC_DIR
+    AC_EGREP_CPP(this_is_true, [
+#include "imap4r1.h"
+#if defined(IMAPSSLPORT)
+      this_is_true
+#endif
+    ],[
+      AC_DEFINE(HAVE_IMAP2001, 1, [ ])
+    ],[])
+    CPPFLAGS=$old_CPPFLAGS
+
+    PHP_CHECK_LIBRARY(pam, pam_start, 
+    [
+      PHP_ADD_LIBRARY(pam,, IMAP_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBPAM,1,[ ])
+    ])
+
+    PHP_CHECK_LIBRARY(crypt, crypt, 
+    [
+      PHP_ADD_LIBRARY(crypt,, IMAP_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBCRYPT,1,[ ])
+    ])
+	    
+    PHP_EXPAND_PATH($IMAP_DIR, IMAP_DIR)
+
+    if test -z "$IMAP_DIR"; then
+      AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+    fi
+
+    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+      ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+      ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
+    fi
+
+    for lib in c-client4 c-client imap; do
+      IMAP_LIB=$lib
+      IMAP_LIB_CHK($PHP_LIBDIR)
+      IMAP_LIB_CHK(c-client)
+    done
+
+    if test -z "$IMAP_LIBDIR"; then
+      AC_MSG_ERROR(Cannot find imap library (libc-client.a). Please check your c-client installation.)
+    fi
+
+    PHP_ADD_INCLUDE($IMAP_INC_DIR)
+    PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD)
+    PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
+    PHP_IMAP_KRB_CHK
+    PHP_IMAP_SSL_CHK
+
+    dnl Test the build in the end
+    TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"
+
+    dnl Check if auth_gss exists
+    PHP_IMAP_TEST_BUILD(auth_gssapi_valid, [
+      AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
+    ], [], $TST_LIBS)
+
+    dnl Check if utf8_to_mutf7 exists
+    PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [
+      AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ])
+    ], [], $TST_LIBS)
+
+    AC_MSG_CHECKING(whether rfc822_output_address_list function present)
+    PHP_TEST_BUILD(foobar, [
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_RFC822_OUTPUT_ADDRESS_LIST, 1, [ ])
+    ], [
+      AC_MSG_RESULT(no)
+	], [
+      $TST_LIBS
+    ], [
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+      PHP_IMAP_EXPORT void mm_log(void){}
+      PHP_IMAP_EXPORT void mm_dlog(void){}
+      PHP_IMAP_EXPORT void mm_flags(void){}
+      PHP_IMAP_EXPORT void mm_fatal(void){}
+      PHP_IMAP_EXPORT void mm_critical(void){}
+      PHP_IMAP_EXPORT void mm_nocritical(void){}
+      PHP_IMAP_EXPORT void mm_notify(void){}
+      PHP_IMAP_EXPORT void mm_login(void){}
+      PHP_IMAP_EXPORT void mm_diskerror(void){}
+      PHP_IMAP_EXPORT void mm_status(void){}
+      PHP_IMAP_EXPORT void mm_lsub(void){}
+      PHP_IMAP_EXPORT void mm_list(void){}
+      PHP_IMAP_EXPORT void mm_exists(void){}
+      PHP_IMAP_EXPORT void mm_searched(void){}
+      PHP_IMAP_EXPORT void mm_expunged(void){}
+      void rfc822_output_address_list(void);
+      void (*f)(void);
+      char foobar () {f = rfc822_output_address_list;}
+    ])
+
+    AC_MSG_CHECKING(whether build with IMAP works)
+    PHP_IMAP_TEST_BUILD(mail_newbody, [
+      AC_MSG_RESULT(yes)
+    ], [
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+    ], $TST_LIBS)
+fi
diff --git a/ext/imap/config.w32 b/ext/imap/config.w32
new file mode 100644
index 0000000..5778c34
--- /dev/null
+++ b/ext/imap/config.w32
@@ -0,0 +1,28 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_WITH("imap", "IMAP Support", "no");
+
+if (PHP_IMAP == "yes") {
+	if (CHECK_LIB("cclient_a.lib;cclient.lib", "imap") &&
+			(CHECK_HEADER_ADD_INCLUDE("c-client.h", "CFLAGS_IMAP")||
+			CHECK_HEADER_ADD_INCLUDE("c-client/c-client.h", "CFLAGS_IMAP", null, null, true)) ||
+			(CHECK_HEADER_ADD_INCLUDE("utf8aux.h", "CFLAGS_IMAP")||
+			CHECK_HEADER_ADD_INCLUDE("c-client/utf8aux.h", "CFLAGS_IMAP", null, null, true))
+			) {
+		CHECK_LIB("winmm.lib", "imap");
+		CHECK_LIB("ws2_32.lib", "imap");
+		CHECK_LIB("Secur32.lib", "imap");
+		CHECK_LIB("crypt32.lib", "imap");
+		EXTENSION("imap", "php_imap.c");
+
+		ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP2007a=1 /D HAVE_IMAP2007b=1 /D HAVE_IMAP_SSL=1");
+		AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
+		AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Have utf8_mime2text', true);
+		AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have rfc822_output_address_list', true);
+		AC_DEFINE('HAVE_IMAP_MUTF7', 1, 'Have modified utf7 support', true);
+		AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Whether utf8_mime2text() has new signature');
+	} else {
+		WARNING("imap not enabled; libraries and headers not found");
+	}
+}
diff --git a/ext/imap/imap.dsp b/ext/imap/imap.dsp
new file mode 100644
index 0000000..ef05d49
--- /dev/null
+++ b/ext/imap/imap.dsp
@@ -0,0 +1,176 @@
+# Microsoft Developer Studio Project File - Name="imap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=imap - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "imap.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "imap.mak" CFG="imap - Win32 Debug_TS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "imap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "imap - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "imap - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "imap - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /out:"Release/php_imap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client"
+
+!ELSEIF  "$(CFG)" == "imap - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\IMAP\c-client" /I "..\..\TSRM" /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40d /d "_DEBUG"
+# ADD RSC /l 0x40d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_imap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client"
+
+!ELSEIF  "$(CFG)" == "imap - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "ZTS" /D "_DEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40d /d "_DEBUG"
+# ADD RSC /l 0x40d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll" /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"
+
+!ELSEIF  "$(CFG)" == "imap - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAP_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\imap\c-client" /D "ZTS" /D "NDEBUG" /D "IMAP_EXPORTS" /D "COMPILE_DL_IMAP" /D HAVE_IMAP=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZEND_DEBUG=0 /D HAVE_IMAP2001=1 /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib wsock32.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\imap"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "imap - Win32 Release"
+# Name "imap - Win32 Debug"
+# Name "imap - Win32 Debug_TS"
+# Name "imap - Win32 Release_TS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\php_imap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\win32\sendmail.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\php_imap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\win32\sendmail.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\IMAP_Win32_HOWTO.txt
+# End Source File
+# End Target
+# End Project
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
new file mode 100644
index 0000000..b154cb8
--- /dev/null
+++ b/ext/imap/php_imap.c
@@ -0,0 +1,5090 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Rex Logan           <veebert@dimensional.com>               |
+   |          Mark Musone         <musone@afterfive.com>                  |
+   |          Brian Wang          <brian@vividnet.com>                    |
+   |          Kaj-Michael Lang    <milang@tal.org>                        |
+   |          Antoni Pamies Olive <toni@readysoft.net>                    |
+   |          Rasmus Lerdorf      <rasmus@php.net>                        |
+   |          Chuck Hagenbuch     <chuck@horde.org>                       |
+   |          Andrew Skalski      <askalski@chekinc.com>                  |
+   |          Hartmut Holzgraefe  <hholzgra@php.net>                      |
+   |          Jani Taskinen       <jani.taskinen@iki.fi>                  |
+   |          Daniel R. Kalowsky  <kalowsky@php.net>                      |
+   | PHP 4.0 updates:  Zeev Suraski <zeev@zend.com>                       |
+   +----------------------------------------------------------------------+
+ */
+/* $Id$ */
+
+#define IMAP41
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "php_streams.h"
+#include "ext/standard/php_string.h"
+#include "ext/standard/info.h"
+#include "ext/standard/file.h"
+#include "ext/standard/php_smart_str.h"
+#include "ext/pcre/php_pcre.h"
+
+#ifdef ERROR
+#undef ERROR
+#endif
+#include "php_imap.h"
+
+#include <time.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+#include <stdlib.h>
+#include "win32/sendmail.h"
+MAILSTREAM DEFAULTPROTO;
+#endif
+
+#define CRLF	"\015\012"
+#define CRLF_LEN sizeof("\015\012") - 1
+#define PHP_EXPUNGE 32768
+#define PHP_IMAP_ADDRESS_SIZE_BUF 10
+#ifndef SENDBUFLEN
+#define SENDBUFLEN 16385
+#endif
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
+#else
+# define PHP_IMAP_EXPORT
+#endif
+
+static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC);
+static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
+static char* _php_imap_parse_address(ADDRESS *addresslist, zval *paddress TSRMLS_DC);
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC);
+
+/* the gets we use */
+static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md);
+
+/* These function declarations are missing from the IMAP header files... */
+void rfc822_date(char *date);
+char *cpystr(const char *str);
+char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
+#ifndef HAVE_NEW_MIME2TEXT
+long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
+#else
+long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
+#endif
+unsigned long find_rightmost_bit(unsigned long *valptr);
+void fs_give(void **block);
+void *fs_get(size_t size);
+
+ZEND_DECLARE_MODULE_GLOBALS(imap)
+static PHP_GINIT_FUNCTION(imap);
+
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, user)
+	ZEND_ARG_INFO(0, password)
+	ZEND_ARG_INFO(0, options)
+	ZEND_ARG_INFO(0, n_retries)
+	ZEND_ARG_INFO(0, params)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, options)
+	ZEND_ARG_INFO(0, n_retries)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, folder)
+	ZEND_ARG_INFO(0, message)
+	ZEND_ARG_INFO(0, options)
+	ZEND_ARG_INFO(0, date)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_ping, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_recent, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quota, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, qroot)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quotaroot, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_set_quota, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, qroot)
+	ZEND_ARG_INFO(0, mailbox_size)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, id)
+	ZEND_ARG_INFO(0, rights)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_gc, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_close, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headers, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_body, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msglist)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, sequence)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_createmailbox, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_renamemailbox, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, old_name)
+	ZEND_ARG_INFO(0, new_name)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_deletemailbox, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_list, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, ref)
+	ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getmailboxes, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, ref)
+	ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_listscan, 0, 0, 4)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, ref)
+	ZEND_ARG_INFO(0, pattern)
+	ZEND_ARG_INFO(0, content)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_check, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_delete, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_undelete, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headerinfo, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, from_length)
+	ZEND_ARG_INFO(0, subject_length)
+	ZEND_ARG_INFO(0, default_host)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_headers, 0, 0, 1)
+	ZEND_ARG_INFO(0, headers)
+	ZEND_ARG_INFO(0, default_host)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_lsub, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, ref)
+	ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getsubscribed, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, ref)
+	ZEND_ARG_INFO(0, pattern)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_subscribe, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_unsubscribe, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchstructure, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchbody, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, section)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_savebody, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, file)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, section)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_base64, 0, 0, 1)
+	ZEND_ARG_INFO(0, text)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_qprint, 0, 0, 1)
+	ZEND_ARG_INFO(0, text)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_8bit, 0, 0, 1)
+	ZEND_ARG_INFO(0, text)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_binary, 0, 0, 1)
+	ZEND_ARG_INFO(0, text)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mailboxmsginfo, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_write_address, 0, 0, 3)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, host)
+	ZEND_ARG_INFO(0, personal)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_adrlist, 0, 0, 2)
+	ZEND_ARG_INFO(0, address_string)
+	ZEND_ARG_INFO(0, default_host)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8, 0, 0, 1)
+	ZEND_ARG_INFO(0, mime_encoded_text)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_decode, 0, 0, 1)
+	ZEND_ARG_INFO(0, buf)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_encode, 0, 0, 1)
+	ZEND_ARG_INFO(0, buf)
+ZEND_END_ARG_INFO()
+
+#ifdef HAVE_IMAP_MUTF7
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8_to_mutf7, 0, 0, 1)
+	ZEND_ARG_INFO(0, in)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mutf7_to_utf8, 0, 0, 1)
+	ZEND_ARG_INFO(0, in)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, sequence)
+	ZEND_ARG_INFO(0, flag)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_clearflag_full, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, sequence)
+	ZEND_ARG_INFO(0, flag)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_sort, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, criteria)
+	ZEND_ARG_INFO(0, reverse)
+	ZEND_ARG_INFO(0, options)
+	ZEND_ARG_INFO(0, search_criteria)
+	ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchheader, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_uid, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_msgno, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, unique_msg_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, mailbox)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_bodystruct, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, msg_no)
+	ZEND_ARG_INFO(0, section)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetch_overview, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, sequence)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_compose, 0, 0, 2)
+	ZEND_ARG_INFO(0, envelope)
+	ZEND_ARG_INFO(0, body)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail, 0, 0, 3)
+	ZEND_ARG_INFO(0, to)
+	ZEND_ARG_INFO(0, subject)
+	ZEND_ARG_INFO(0, message)
+	ZEND_ARG_INFO(0, additional_headers)
+	ZEND_ARG_INFO(0, cc)
+	ZEND_ARG_INFO(0, bcc)
+	ZEND_ARG_INFO(0, rpath)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_search, 0, 0, 2)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, criteria)
+	ZEND_ARG_INFO(0, options)
+	ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_imap_alerts, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_imap_errors, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_imap_last_error, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mime_header_decode, 0, 0, 1)
+	ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_thread, 0, 0, 1)
+	ZEND_ARG_INFO(0, stream_id)
+	ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_timeout, 0, 0, 1)
+	ZEND_ARG_INFO(0, timeout_type)
+	ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO()
+/* }}} */
+
+/* {{{ imap_functions[]
+ */
+const zend_function_entry imap_functions[] = {
+	PHP_FE(imap_open,								arginfo_imap_open)
+	PHP_FE(imap_reopen,								arginfo_imap_reopen)
+	PHP_FE(imap_close,								arginfo_imap_close)
+	PHP_FE(imap_num_msg,							arginfo_imap_num_msg)
+	PHP_FE(imap_num_recent,							arginfo_imap_num_recent)
+	PHP_FE(imap_headers,							arginfo_imap_headers)
+	PHP_FE(imap_headerinfo,							arginfo_imap_headerinfo)
+	PHP_FE(imap_rfc822_parse_headers,				arginfo_imap_rfc822_parse_headers)
+	PHP_FE(imap_rfc822_write_address,				arginfo_imap_rfc822_write_address)
+	PHP_FE(imap_rfc822_parse_adrlist,				arginfo_imap_rfc822_parse_adrlist)
+	PHP_FE(imap_body,								arginfo_imap_body)
+	PHP_FE(imap_bodystruct,							arginfo_imap_bodystruct)
+	PHP_FE(imap_fetchbody,							arginfo_imap_fetchbody)
+	PHP_FE(imap_fetchmime,							arginfo_imap_fetchbody)
+	PHP_FE(imap_savebody,							arginfo_imap_savebody)
+	PHP_FE(imap_fetchheader,						arginfo_imap_fetchheader)
+	PHP_FE(imap_fetchstructure,						arginfo_imap_fetchstructure)
+	PHP_FE(imap_gc,										arginfo_imap_gc)
+	PHP_FE(imap_expunge,							arginfo_imap_expunge)
+	PHP_FE(imap_delete,								arginfo_imap_delete)
+	PHP_FE(imap_undelete,							arginfo_imap_undelete)
+	PHP_FE(imap_check,								arginfo_imap_check)
+	PHP_FE(imap_listscan,							arginfo_imap_listscan)
+	PHP_FE(imap_mail_copy,							arginfo_imap_mail_copy)
+	PHP_FE(imap_mail_move,							arginfo_imap_mail_move)
+	PHP_FE(imap_mail_compose,						arginfo_imap_mail_compose)
+	PHP_FE(imap_createmailbox,						arginfo_imap_createmailbox)
+	PHP_FE(imap_renamemailbox,						arginfo_imap_renamemailbox)
+	PHP_FE(imap_deletemailbox,						arginfo_imap_deletemailbox)
+	PHP_FE(imap_subscribe,							arginfo_imap_subscribe)
+	PHP_FE(imap_unsubscribe,						arginfo_imap_unsubscribe)
+	PHP_FE(imap_append,								arginfo_imap_append)
+	PHP_FE(imap_ping,								arginfo_imap_ping)
+	PHP_FE(imap_base64,								arginfo_imap_base64)
+	PHP_FE(imap_qprint,								arginfo_imap_qprint)
+	PHP_FE(imap_8bit,								arginfo_imap_8bit)
+	PHP_FE(imap_binary,								arginfo_imap_binary)
+	PHP_FE(imap_utf8,								arginfo_imap_utf8)
+	PHP_FE(imap_status,								arginfo_imap_status)
+	PHP_FE(imap_mailboxmsginfo,						arginfo_imap_mailboxmsginfo)
+	PHP_FE(imap_setflag_full,						arginfo_imap_setflag_full)
+	PHP_FE(imap_clearflag_full,						arginfo_imap_clearflag_full)
+	PHP_FE(imap_sort,								arginfo_imap_sort)
+	PHP_FE(imap_uid,								arginfo_imap_uid)
+	PHP_FE(imap_msgno,								arginfo_imap_msgno)
+	PHP_FE(imap_list,								arginfo_imap_list)
+	PHP_FE(imap_lsub,								arginfo_imap_lsub)
+	PHP_FE(imap_fetch_overview,						arginfo_imap_fetch_overview)
+	PHP_FE(imap_alerts,								arginfo_imap_alerts)
+	PHP_FE(imap_errors,								arginfo_imap_errors)
+	PHP_FE(imap_last_error,							arginfo_imap_last_error)
+	PHP_FE(imap_search,								arginfo_imap_search)
+	PHP_FE(imap_utf7_decode,						arginfo_imap_utf7_decode)
+	PHP_FE(imap_utf7_encode,						arginfo_imap_utf7_encode)
+#ifdef HAVE_IMAP_MUTF7
+	PHP_FE(imap_utf8_to_mutf7,						arginfo_imap_utf8_to_mutf7)
+	PHP_FE(imap_mutf7_to_utf8,						arginfo_imap_mutf7_to_utf8)
+#endif
+	PHP_FE(imap_mime_header_decode,					arginfo_imap_mime_header_decode)
+	PHP_FE(imap_thread,								arginfo_imap_thread)
+	PHP_FE(imap_timeout,								arginfo_imap_timeout)
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+	PHP_FE(imap_get_quota,							arginfo_imap_get_quota)
+	PHP_FE(imap_get_quotaroot,						arginfo_imap_get_quotaroot)
+	PHP_FE(imap_set_quota,							arginfo_imap_set_quota)
+	PHP_FE(imap_setacl,								arginfo_imap_setacl)
+	PHP_FE(imap_getacl,								arginfo_imap_getacl)
+#endif
+
+	PHP_FE(imap_mail,								arginfo_imap_mail)
+
+	PHP_FALIAS(imap_header,			imap_headerinfo,	arginfo_imap_headerinfo)
+	PHP_FALIAS(imap_listmailbox,	imap_list,			arginfo_imap_list)
+	PHP_FALIAS(imap_getmailboxes,	imap_list_full,		arginfo_imap_getmailboxes)
+	PHP_FALIAS(imap_scanmailbox,	imap_listscan,		arginfo_imap_listscan)
+	PHP_FALIAS(imap_listsubscribed,	imap_lsub,			arginfo_imap_lsub)
+	PHP_FALIAS(imap_getsubscribed,	imap_lsub_full,		arginfo_imap_getsubscribed)
+	PHP_FALIAS(imap_fetchtext,		imap_body,			arginfo_imap_body)
+	PHP_FALIAS(imap_scan,			imap_listscan,		arginfo_imap_listscan)
+	PHP_FALIAS(imap_create,			imap_createmailbox,	arginfo_imap_createmailbox)
+	PHP_FALIAS(imap_rename,			imap_renamemailbox,	arginfo_imap_renamemailbox)
+	PHP_FE_END
+};
+/* }}} */
+
+/* {{{ imap dependencies */
+static const zend_module_dep imap_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	ZEND_MOD_END
+};
+/* }}} */
+
+/* {{{ imap_module_entry
+ */
+zend_module_entry imap_module_entry = {
+	STANDARD_MODULE_HEADER_EX, NULL,
+	imap_deps,
+	"imap",
+	imap_functions,
+	PHP_MINIT(imap),
+	NULL,
+	PHP_RINIT(imap),
+	PHP_RSHUTDOWN(imap),
+	PHP_MINFO(imap),
+	NO_VERSION_YET,
+	PHP_MODULE_GLOBALS(imap),
+	PHP_GINIT(imap),
+	NULL,
+	NULL,
+	STANDARD_MODULE_PROPERTIES_EX
+};
+/* }}} */
+
+#ifdef COMPILE_DL_IMAP
+ZEND_GET_MODULE(imap)
+#endif
+
+/* True globals, no need for thread safety */
+static int le_imap;
+
+#define PHP_IMAP_CHECK_MSGNO(msgindex)	\
+	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {	\
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");	\
+		RETURN_FALSE;	\
+	}	\
+
+/* {{{ mail_close_it
+ */
+static void mail_close_it(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	pils *imap_le_struct = (pils *)rsrc->ptr;
+
+	/* Do not try to close prototype streams */
+	if (!(imap_le_struct->flags & OP_PROTOTYPE)) {
+		mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags);
+	}
+
+	if (IMAPG(imap_user)) {
+		efree(IMAPG(imap_user));
+		IMAPG(imap_user) = 0;
+	}
+	if (IMAPG(imap_password)) {
+		efree(IMAPG(imap_password));
+		IMAPG(imap_password) = 0;
+	}
+
+	efree(imap_le_struct);
+}
+/* }}} */
+
+/* {{{ add_assoc_object
+ */
+static int add_assoc_object(zval *arg, char *key, zval *tmp TSRMLS_DC)
+{
+	HashTable *symtable;
+
+	if (Z_TYPE_P(arg) == IS_OBJECT) {
+		symtable = Z_OBJPROP_P(arg);
+	} else {
+		symtable = Z_ARRVAL_P(arg);
+	}
+	return zend_hash_update(symtable, key, strlen(key)+1, (void *) &tmp, sizeof(zval *), NULL);
+}
+/* }}} */
+
+/* {{{ add_next_index_object
+ */
+static inline int add_next_index_object(zval *arg, zval *tmp TSRMLS_DC)
+{
+	HashTable *symtable;
+
+	if (Z_TYPE_P(arg) == IS_OBJECT) {
+		symtable = Z_OBJPROP_P(arg);
+	} else {
+		symtable = Z_ARRVAL_P(arg);
+	}
+
+	return zend_hash_next_index_insert(symtable, (void *) &tmp, sizeof(zval *), NULL);
+}
+/* }}} */
+
+/* {{{ mail_newfolderobjectlist
+ *
+ * Mail instantiate FOBJECTLIST
+ * Returns: new FOBJECTLIST list
+ * Author: CJH
+ */
+FOBJECTLIST *mail_newfolderobjectlist(void)
+{
+	return (FOBJECTLIST *) memset(fs_get(sizeof(FOBJECTLIST)), 0, sizeof(FOBJECTLIST));
+}
+/* }}} */
+
+/* {{{ mail_free_foblist
+ *
+ * Mail garbage collect FOBJECTLIST
+ * Accepts: pointer to FOBJECTLIST pointer
+ * Author: CJH
+ */
+void mail_free_foblist(FOBJECTLIST **foblist, FOBJECTLIST **tail)
+{
+	FOBJECTLIST *cur, *next;
+
+	for (cur=*foblist, next=cur->next; cur; cur=next) {
+		next = cur->next;
+
+		if(cur->text.data)
+			fs_give((void **)&(cur->text.data));
+
+		fs_give((void **)&cur);
+	}
+
+	*tail = NIL;
+	*foblist = NIL;
+}
+/* }}} */
+
+/* {{{ mail_newerrorlist
+ *
+ * Mail instantiate ERRORLIST
+ * Returns: new ERRORLIST list
+ * Author: CJH
+ */
+ERRORLIST *mail_newerrorlist(void)
+{
+	return (ERRORLIST *) memset(fs_get(sizeof(ERRORLIST)), 0, sizeof(ERRORLIST));
+}
+/* }}} */
+
+/* {{{ mail_free_errorlist
+ *
+ * Mail garbage collect FOBJECTLIST
+ * Accepts: pointer to FOBJECTLIST pointer
+ * Author: CJH
+ */
+void mail_free_errorlist(ERRORLIST **errlist)
+{
+	if (*errlist) {		/* only free if exists */
+		if ((*errlist)->text.data) {
+			fs_give((void **) &(*errlist)->text.data);
+		}
+		mail_free_errorlist (&(*errlist)->next);
+		fs_give((void **) errlist);	/* return string to free storage */
+	}
+}
+/* }}} */
+
+/* {{{ mail_newmessagelist
+ *
+ * Mail instantiate MESSAGELIST
+ * Returns: new MESSAGELIST list
+ * Author: CJH
+ */
+MESSAGELIST *mail_newmessagelist(void)
+{
+	return (MESSAGELIST *) memset(fs_get(sizeof(MESSAGELIST)), 0, sizeof(MESSAGELIST));
+}
+/* }}} */
+
+/* {{{ mail_free_messagelist
+ *
+ * Mail garbage collect MESSAGELIST
+ * Accepts: pointer to MESSAGELIST pointer
+ * Author: CJH
+ */
+void mail_free_messagelist(MESSAGELIST **msglist, MESSAGELIST **tail)
+{
+	MESSAGELIST *cur, *next;
+
+	for (cur = *msglist, next = cur->next; cur; cur = next) {
+		next = cur->next;
+		fs_give((void **)&cur);
+	}
+
+	*tail = NIL;
+	*msglist = NIL;
+}
+/* }}} */
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+/* {{{ mail_getquota
+ *
+ * Mail GET_QUOTA callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ * Author DRK
+ */
+
+void mail_getquota(MAILSTREAM *stream, char *qroot, QUOTALIST *qlist)
+{
+	zval *t_map, *return_value;
+	TSRMLS_FETCH();
+
+	return_value = *IMAPG(quota_return);
+
+/* put parsing code here */
+	for(; qlist; qlist = qlist->next) {
+		MAKE_STD_ZVAL(t_map);
+		array_init(t_map);
+		if (strncmp(qlist->name, "STORAGE", 7) == 0)
+		{
+			/* this is to add backwards compatibility */
+			add_assoc_long_ex(return_value, "usage", sizeof("usage"), qlist->usage);
+			add_assoc_long_ex(return_value, "limit", sizeof("limit"), qlist->limit);
+		}
+
+		add_assoc_long_ex(t_map, "usage", sizeof("usage"), qlist->usage);
+		add_assoc_long_ex(t_map, "limit", sizeof("limit"), qlist->limit);
+		add_assoc_zval_ex(return_value, qlist->name, strlen(qlist->name)+1, t_map);
+	}
+}
+/* }}} */
+
+/* {{{ mail_getquota
+ *
+ * Mail GET_ACL callback
+ * Called via the mail_parameter function in c-client:src/c-client/mail.c
+ */
+void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist)
+{
+	TSRMLS_FETCH();
+
+	/* walk through the ACLLIST */
+	for(; alist; alist = alist->next) {
+		add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
+	}
+}
+/* }}} */
+#endif
+
+/* {{{ PHP_GINIT_FUNCTION
+ */
+static PHP_GINIT_FUNCTION(imap)
+{
+	imap_globals->imap_user = NIL;
+	imap_globals->imap_password = NIL;
+
+	imap_globals->imap_alertstack = NIL;
+	imap_globals->imap_errorstack = NIL;
+
+	imap_globals->imap_folders = NIL;
+	imap_globals->imap_folders_tail = NIL;
+	imap_globals->imap_sfolders = NIL;
+	imap_globals->imap_sfolders_tail = NIL;
+	imap_globals->imap_messages = NIL;
+	imap_globals->imap_messages_tail = NIL;
+	imap_globals->imap_folder_objects = NIL;
+	imap_globals->imap_folder_objects_tail = NIL;
+	imap_globals->imap_sfolder_objects = NIL;
+	imap_globals->imap_sfolder_objects_tail = NIL;
+
+	imap_globals->folderlist_style = FLIST_ARRAY;
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+	imap_globals->quota_return = NIL;
+	imap_globals->imap_acl_list = NIL;
+#endif
+	imap_globals->gets_stream = NIL;
+}
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(imap)
+{
+	unsigned long sa_all =	SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY;
+
+#ifndef PHP_WIN32
+	mail_link(&unixdriver);		/* link in the unix driver */
+	mail_link(&mhdriver);		/* link in the mh driver */
+	/* mail_link(&mxdriver); */	/* According to c-client docs (internal.txt) this shouldn't be used. */
+	mail_link(&mmdfdriver);		/* link in the mmdf driver */
+	mail_link(&newsdriver);		/* link in the news driver */
+	mail_link(&philedriver);	/* link in the phile driver */
+#endif
+	mail_link(&imapdriver);		/* link in the imap driver */
+	mail_link(&nntpdriver);		/* link in the nntp driver */
+	mail_link(&pop3driver);		/* link in the pop3 driver */
+	mail_link(&mbxdriver);		/* link in the mbx driver */
+	mail_link(&tenexdriver);	/* link in the tenex driver */
+	mail_link(&mtxdriver);		/* link in the mtx driver */
+	mail_link(&dummydriver);	/* link in the dummy driver */
+
+#ifndef PHP_WIN32
+	auth_link(&auth_log);		/* link in the log authenticator */
+	auth_link(&auth_md5);		/* link in the cram-md5 authenticator */
+#if HAVE_IMAP_KRB && defined(HAVE_IMAP_AUTH_GSS)
+	auth_link(&auth_gss);		/* link in the gss authenticator */
+#endif
+	auth_link(&auth_pla);		/* link in the plain authenticator */
+#endif
+
+#ifdef HAVE_IMAP_SSL
+	ssl_onceonlyinit ();
+#endif
+
+	/* lets allow NIL */
+	REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);
+
+	/* plug in our gets */
+	mail_parameters(NIL, SET_GETS, (void *) NIL);
+
+	/* set default timeout values */
+	mail_parameters(NIL, SET_OPENTIMEOUT, (void *) FG(default_socket_timeout));
+	mail_parameters(NIL, SET_READTIMEOUT, (void *) FG(default_socket_timeout));
+	mail_parameters(NIL, SET_WRITETIMEOUT, (void *) FG(default_socket_timeout));
+	mail_parameters(NIL, SET_CLOSETIMEOUT, (void *) FG(default_socket_timeout));
+
+	/* timeout constants */
+	REGISTER_LONG_CONSTANT("IMAP_OPENTIMEOUT", 1, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("IMAP_READTIMEOUT", 2, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("IMAP_WRITETIMEOUT", 3, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("IMAP_CLOSETIMEOUT", 4, CONST_PERSISTENT | CONST_CS);
+
+	/* Open Options */
+
+	REGISTER_LONG_CONSTANT("OP_DEBUG", OP_DEBUG, CONST_PERSISTENT | CONST_CS);
+	/* debug protocol negotiations */
+	REGISTER_LONG_CONSTANT("OP_READONLY", OP_READONLY, CONST_PERSISTENT | CONST_CS);
+	/* read-only open */
+	REGISTER_LONG_CONSTANT("OP_ANONYMOUS", OP_ANONYMOUS, CONST_PERSISTENT | CONST_CS);
+	/* anonymous open of newsgroup */
+	REGISTER_LONG_CONSTANT("OP_SHORTCACHE", OP_SHORTCACHE, CONST_PERSISTENT | CONST_CS);
+	/* short (elt-only) caching */
+	REGISTER_LONG_CONSTANT("OP_SILENT", OP_SILENT, CONST_PERSISTENT | CONST_CS);
+	/* don't pass up events (internal use) */
+	REGISTER_LONG_CONSTANT("OP_PROTOTYPE", OP_PROTOTYPE, CONST_PERSISTENT | CONST_CS);
+	/* return driver prototype */
+	REGISTER_LONG_CONSTANT("OP_HALFOPEN", OP_HALFOPEN, CONST_PERSISTENT | CONST_CS);
+	/* half-open (IMAP connect but no select) */
+	REGISTER_LONG_CONSTANT("OP_EXPUNGE", OP_EXPUNGE, CONST_PERSISTENT | CONST_CS);
+	/* silently expunge recycle stream */
+	REGISTER_LONG_CONSTANT("OP_SECURE", OP_SECURE, CONST_PERSISTENT | CONST_CS);
+	/* don't do non-secure authentication */
+
+	/*
+	PHP re-assigns CL_EXPUNGE a custom value that can be used as part of the imap_open() bitfield
+	because it seems like a good idea to be able to indicate that the mailbox should be
+	automatically expunged during imap_open in case the script get interrupted and it doesn't get
+	to the imap_close() where this option is normally placed.  If the c-client library adds other
+	options and the value for this one conflicts, simply make PHP_EXPUNGE higher at the top of
+	this file
+	*/
+	REGISTER_LONG_CONSTANT("CL_EXPUNGE", PHP_EXPUNGE, CONST_PERSISTENT | CONST_CS);
+	/* expunge silently */
+
+	/* Fetch options */
+
+	REGISTER_LONG_CONSTANT("FT_UID", FT_UID, CONST_PERSISTENT | CONST_CS);
+	/* argument is a UID */
+	REGISTER_LONG_CONSTANT("FT_PEEK", FT_PEEK, CONST_PERSISTENT | CONST_CS);
+	/* peek at data */
+	REGISTER_LONG_CONSTANT("FT_NOT", FT_NOT, CONST_PERSISTENT | CONST_CS);
+	/* NOT flag for header lines fetch */
+	REGISTER_LONG_CONSTANT("FT_INTERNAL", FT_INTERNAL, CONST_PERSISTENT | CONST_CS);
+	/* text can be internal strings */
+	REGISTER_LONG_CONSTANT("FT_PREFETCHTEXT", FT_PREFETCHTEXT, CONST_PERSISTENT | CONST_CS);
+	/* IMAP prefetch text when fetching header */
+
+	/* Flagging options */
+
+	REGISTER_LONG_CONSTANT("ST_UID", ST_UID, CONST_PERSISTENT | CONST_CS);
+	/* argument is a UID sequence */
+	REGISTER_LONG_CONSTANT("ST_SILENT", ST_SILENT, CONST_PERSISTENT | CONST_CS);
+	/* don't return results */
+	REGISTER_LONG_CONSTANT("ST_SET", ST_SET, CONST_PERSISTENT | CONST_CS);
+	/* set vs. clear */
+
+	/* Copy options */
+
+	REGISTER_LONG_CONSTANT("CP_UID", CP_UID, CONST_PERSISTENT | CONST_CS);
+	/* argument is a UID sequence */
+	REGISTER_LONG_CONSTANT("CP_MOVE", CP_MOVE, CONST_PERSISTENT | CONST_CS);
+	/* delete from source after copying */
+
+	/* Search/sort options */
+
+	REGISTER_LONG_CONSTANT("SE_UID", SE_UID, CONST_PERSISTENT | CONST_CS);
+	/* return UID */
+	REGISTER_LONG_CONSTANT("SE_FREE", SE_FREE, CONST_PERSISTENT | CONST_CS);
+	/* free search program after finished */
+	REGISTER_LONG_CONSTANT("SE_NOPREFETCH", SE_NOPREFETCH, CONST_PERSISTENT | CONST_CS);
+	/* no search prefetching */
+	REGISTER_LONG_CONSTANT("SO_FREE", SO_FREE, CONST_PERSISTENT | CONST_CS);
+	/* free sort program after finished */
+	REGISTER_LONG_CONSTANT("SO_NOSERVER", SO_NOSERVER, CONST_PERSISTENT | CONST_CS);
+	/* don't do server-based sort */
+
+	/* Status options */
+
+	REGISTER_LONG_CONSTANT("SA_MESSAGES", SA_MESSAGES , CONST_PERSISTENT | CONST_CS);
+	/* number of messages */
+	REGISTER_LONG_CONSTANT("SA_RECENT", SA_RECENT, CONST_PERSISTENT | CONST_CS);
+	/* number of recent messages */
+	REGISTER_LONG_CONSTANT("SA_UNSEEN", SA_UNSEEN , CONST_PERSISTENT | CONST_CS);
+	/* number of unseen messages */
+	REGISTER_LONG_CONSTANT("SA_UIDNEXT", SA_UIDNEXT, CONST_PERSISTENT | CONST_CS);
+	/* next UID to be assigned */
+	REGISTER_LONG_CONSTANT("SA_UIDVALIDITY", SA_UIDVALIDITY , CONST_PERSISTENT | CONST_CS);
+	/* UID validity value */
+	REGISTER_LONG_CONSTANT("SA_ALL", sa_all, CONST_PERSISTENT | CONST_CS);
+	/* get all status information */
+
+	/* Bits for mm_list() and mm_lsub() */
+
+	REGISTER_LONG_CONSTANT("LATT_NOINFERIORS", LATT_NOINFERIORS , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LATT_NOSELECT", LATT_NOSELECT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LATT_MARKED", LATT_MARKED, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LATT_UNMARKED", LATT_UNMARKED , CONST_PERSISTENT | CONST_CS);
+
+#ifdef LATT_REFERRAL
+	REGISTER_LONG_CONSTANT("LATT_REFERRAL", LATT_REFERRAL, CONST_PERSISTENT | CONST_CS);
+#endif
+
+#ifdef LATT_HASCHILDREN
+	REGISTER_LONG_CONSTANT("LATT_HASCHILDREN", LATT_HASCHILDREN, CONST_PERSISTENT | CONST_CS);
+#endif
+
+#ifdef LATT_HASNOCHILDREN
+	REGISTER_LONG_CONSTANT("LATT_HASNOCHILDREN", LATT_HASNOCHILDREN, CONST_PERSISTENT | CONST_CS);
+#endif
+
+	/* Sort functions */
+
+	REGISTER_LONG_CONSTANT("SORTDATE", SORTDATE , CONST_PERSISTENT | CONST_CS);
+	/* date */
+	REGISTER_LONG_CONSTANT("SORTARRIVAL", SORTARRIVAL , CONST_PERSISTENT | CONST_CS);
+	/* arrival date */
+	REGISTER_LONG_CONSTANT("SORTFROM", SORTFROM , CONST_PERSISTENT | CONST_CS);
+	/* from */
+	REGISTER_LONG_CONSTANT("SORTSUBJECT", SORTSUBJECT , CONST_PERSISTENT | CONST_CS);
+	/* subject */
+	REGISTER_LONG_CONSTANT("SORTTO", SORTTO , CONST_PERSISTENT | CONST_CS);
+	/* to */
+	REGISTER_LONG_CONSTANT("SORTCC", SORTCC , CONST_PERSISTENT | CONST_CS);
+	/* cc */
+	REGISTER_LONG_CONSTANT("SORTSIZE", SORTSIZE , CONST_PERSISTENT | CONST_CS);
+	/* size */
+
+	REGISTER_LONG_CONSTANT("TYPETEXT", TYPETEXT , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEMULTIPART", TYPEMULTIPART , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEMESSAGE", TYPEMESSAGE , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEAPPLICATION", TYPEAPPLICATION , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEAUDIO", TYPEAUDIO , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEIMAGE", TYPEIMAGE , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEVIDEO", TYPEVIDEO , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEMODEL", TYPEMODEL , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("TYPEOTHER", TYPEOTHER , CONST_PERSISTENT | CONST_CS);
+	/*
+	TYPETEXT                unformatted text
+	TYPEMULTIPART           multiple part
+	TYPEMESSAGE             encapsulated message
+	TYPEAPPLICATION         application data
+	TYPEAUDIO               audio
+	TYPEIMAGE               static image (GIF, JPEG, etc.)
+	TYPEVIDEO               video
+	TYPEMODEL               model
+	TYPEOTHER               unknown
+	*/
+
+	REGISTER_LONG_CONSTANT("ENC7BIT", ENC7BIT , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("ENC8BIT", ENC8BIT , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("ENCBINARY", ENCBINARY , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("ENCBASE64", ENCBASE64, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("ENCQUOTEDPRINTABLE", ENCQUOTEDPRINTABLE , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("ENCOTHER", ENCOTHER , CONST_PERSISTENT | CONST_CS);
+	/*
+	ENC7BIT                 7 bit SMTP semantic data
+	ENC8BIT                 8 bit SMTP semantic data
+	ENCBINARY               8 bit binary data
+	ENCBASE64               base-64 encoded data
+	ENCQUOTEDPRINTABLE      human-readable 8-as-7 bit data
+	ENCOTHER                unknown
+	*/
+
+	REGISTER_LONG_CONSTANT("IMAP_GC_ELT", GC_ELT , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("IMAP_GC_ENV", GC_ENV , CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("IMAP_GC_TEXTS", GC_TEXTS , CONST_PERSISTENT | CONST_CS);
+	/*
+	GC_ELT                 message cache elements
+	GC_ENV                 ENVELOPEs and BODYs
+	GC_TEXTS               texts
+	*/
+
+	le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number);
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RINIT_FUNCTION
+ */
+PHP_RINIT_FUNCTION(imap)
+{
+	IMAPG(imap_errorstack) = NIL;
+	IMAPG(imap_alertstack) = NIL;
+	IMAPG(gets_stream) = NIL;
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RSHUTDOWN_FUNCTION
+ */
+PHP_RSHUTDOWN_FUNCTION(imap)
+{
+	ERRORLIST *ecur = NIL;
+	STRINGLIST *acur = NIL;
+
+	if (IMAPG(imap_errorstack) != NIL) {
+		/* output any remaining errors at their original error level */
+		if (EG(error_reporting) & E_NOTICE) {
+			ecur = IMAPG(imap_errorstack);
+			while (ecur != NIL) {
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s (errflg=%ld)", ecur->LTEXT, ecur->errflg);
+				ecur = ecur->next;
+			}
+		}
+		mail_free_errorlist(&IMAPG(imap_errorstack));
+	}
+
+	if (IMAPG(imap_alertstack) != NIL) {
+		/* output any remaining alerts at E_NOTICE level */
+		if (EG(error_reporting) & E_NOTICE) {
+			acur = IMAPG(imap_alertstack);
+			while (acur != NIL) {
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", acur->LTEXT);
+				acur = acur->next;
+			}
+		}
+		mail_free_stringlist(&IMAPG(imap_alertstack));
+		IMAPG(imap_alertstack) = NIL;
+	}
+	return SUCCESS;
+}
+/* }}} */
+
+#if !defined(CCLIENTVERSION)
+#if HAVE_IMAP2007e
+#define CCLIENTVERSION "2007e"
+#elif HAVE_IMAP2007d
+#define CCLIENTVERSION "2007d"
+#elif HAVE_IMAP2007b
+#define CCLIENTVERSION "2007b"
+#elif HAVE_IMAP2007a
+#define CCLIENTVERSION "2007a"
+#elif HAVE_IMAP2004
+#define CCLIENTVERSION "2004"
+#elif HAVE_IMAP2001
+#define CCLIENTVERSION "2001"
+#elif HAVE_IMAP2000
+#define CCLIENTVERSION "2000"
+#elif defined(IMAP41)
+#define CCLIENTVERSION "4.1"
+#else
+#define CCLIENTVERSION "4.0"
+#endif
+#endif
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(imap)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
+#if HAVE_IMAP_SSL
+	php_info_print_table_row(2, "SSL Support", "enabled");
+#endif
+#if HAVE_IMAP_KRB && HAVE_IMAP_AUTH_GSS
+	php_info_print_table_row(2, "Kerberos Support", "enabled");
+#endif
+	php_info_print_table_end();
+}
+/* }}} */
+
+/* {{{ imap_do_open
+ */
+static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
+{
+	char *mailbox, *user, *passwd;
+	int mailbox_len, user_len, passwd_len;
+	long retries = 0, flags = NIL, cl_flags = NIL;
+	MAILSTREAM *imap_stream;
+	pils *imap_le_struct;
+	zval *params = NULL;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "pss|lla", &mailbox, &mailbox_len, &user, &user_len,
+		&passwd, &passwd_len, &flags, &retries, &params) == FAILURE) {
+		return;
+	}
+
+	if (argc >= 4) {
+		if (flags & PHP_EXPUNGE) {
+			cl_flags = CL_EXPUNGE;
+			flags ^= PHP_EXPUNGE;
+		}
+		if (flags & OP_PROTOTYPE) {
+			cl_flags |= OP_PROTOTYPE;
+		}
+	}
+
+	if (params) {
+		zval **disabled_auth_method;
+
+		if (zend_hash_find(HASH_OF(params), "DISABLE_AUTHENTICATOR", sizeof("DISABLE_AUTHENTICATOR"), (void **)&disabled_auth_method) == SUCCESS) {
+			switch (Z_TYPE_PP(disabled_auth_method)) {
+				case IS_STRING:
+					if (Z_STRLEN_PP(disabled_auth_method) > 1) {
+						mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(disabled_auth_method));
+					}
+					break;
+				case IS_ARRAY:
+					{
+						zval **z_auth_method;
+						int i;
+						int nelems = zend_hash_num_elements(Z_ARRVAL_PP(disabled_auth_method));
+
+						if (nelems == 0 ) {
+							break;
+						}
+						for (i = 0; i < nelems; i++) {
+							if (zend_hash_index_find(Z_ARRVAL_PP(disabled_auth_method), i, (void **) &z_auth_method) == SUCCESS) {
+								if (Z_TYPE_PP(z_auth_method) == IS_STRING) {
+									if (Z_STRLEN_PP(z_auth_method) > 1) {
+										mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(z_auth_method));
+									}
+								} else {
+									php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings");
+								}
+							}
+						}
+					}
+					break;
+				case IS_LONG:
+				default:
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings");
+					break;
+			}
+		}
+	}
+
+	if (IMAPG(imap_user)) {
+		efree(IMAPG(imap_user));
+		IMAPG(imap_user) = 0;
+	}
+
+	if (IMAPG(imap_password)) {
+		efree(IMAPG(imap_password));
+		IMAPG(imap_password) = 0;
+	}
+
+	/* local filename, need to perform open_basedir check */
+	if (mailbox[0] != '{' && php_check_open_basedir(mailbox TSRMLS_CC)) {
+		RETURN_FALSE;
+	}
+
+	IMAPG(imap_user)     = estrndup(user, user_len);
+	IMAPG(imap_password) = estrndup(passwd, passwd_len);
+
+#ifdef SET_MAXLOGINTRIALS
+	if (argc >= 5) {
+		if (retries < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING ,"Retries must be greater or equal to 0");
+		} else {
+			mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *) retries);
+		}
+	}
+#endif
+
+	imap_stream = mail_open(NIL, mailbox, flags);
+
+	if (imap_stream == NIL) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't open stream %s", mailbox);
+		efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
+		efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
+		RETURN_FALSE;
+	}
+
+	imap_le_struct = emalloc(sizeof(pils));
+	imap_le_struct->imap_stream = imap_stream;
+	imap_le_struct->flags = cl_flags;
+
+	ZEND_REGISTER_RESOURCE(return_value, imap_le_struct, le_imap);
+}
+/* }}} */
+
+/* {{{ proto resource imap_open(string mailbox, string user, string password [, int options [, int n_retries]])
+   Open an IMAP stream to a mailbox */
+PHP_FUNCTION(imap_open)
+{
+	php_imap_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto bool imap_reopen(resource stream_id, string mailbox [, int options [, int n_retries]])
+   Reopen an IMAP stream to a new mailbox */
+PHP_FUNCTION(imap_reopen)
+{
+	zval *streamind;
+	char *mailbox;
+	int mailbox_len;
+	long options = 0, retries = 0;
+	pils *imap_le_struct;
+	MAILSTREAM *imap_stream;
+	long flags=NIL;
+	long cl_flags=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|ll", &streamind, &mailbox, &mailbox_len, &options, &retries) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (options) {
+		flags = options;
+		if (flags & PHP_EXPUNGE) {
+			cl_flags = CL_EXPUNGE;
+			flags ^= PHP_EXPUNGE;
+		}
+		imap_le_struct->flags = cl_flags;
+	}
+#ifdef SET_MAXLOGINTRIALS
+	if (retries) {
+		mail_parameters(NIL, SET_MAXLOGINTRIALS, (void *) retries);
+	}
+#endif
+	/* local filename, need to perform open_basedir check */
+	if (mailbox[0] != '{' && php_check_open_basedir(mailbox TSRMLS_CC)) {
+		RETURN_FALSE;
+	}
+
+	imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
+	if (imap_stream == NIL) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream");
+		RETURN_FALSE;
+	}
+	imap_le_struct->imap_stream = imap_stream;
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool imap_append(resource stream_id, string folder, string message [, string options [, string internal_date]])
+   Append a new message to a specified mailbox */
+PHP_FUNCTION(imap_append)
+{
+	zval *streamind;
+	char *folder, *message, *internal_date = NULL, *flags = NULL;
+	int folder_len, message_len, internal_date_len = 0, flags_len = 0;
+	pils *imap_le_struct;
+	STRING st;
+	char* regex = "/[0-3][0-9]-((Jan)|(Feb)|(Mar)|(Apr)|(May)|(Jun)|(Jul)|(Aug)|(Sep)|(Oct)|(Nov)|(Dec))-[0-9]{4} [0-2][0-9]:[0-5][0-9]:[0-5][0-9] [+-][0-9]{4}/";
+	const int regex_len = strlen(regex);
+	pcre_cache_entry *pce;				/* Compiled regex */
+	zval *subpats = NULL;				/* Parts (not used) */
+	long regex_flags = 0;				/* Flags (not used) */
+	long start_offset = 0;				/* Start offset (not used) */
+	int global = 0;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|ss", &streamind, &folder, &folder_len, &message, &message_len, &flags, &flags_len, &internal_date, &internal_date_len) == FAILURE) {
+		return;
+	}
+
+	if (internal_date) {
+		/* Make sure the given internal_date string matches the RFC specifiedformat */
+		if ((pce = pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC))== NULL) {
+			RETURN_FALSE;
+		}
+
+		php_pcre_match_impl(pce, internal_date, internal_date_len, return_value, subpats, global,
+			0, regex_flags, start_offset TSRMLS_CC);
+
+		if (!Z_LVAL_P(return_value)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "internal date not correctly formatted");
+			internal_date = NULL;
+		}
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	INIT (&st, mail_string, (void *) message, message_len);
+
+	if (mail_append_full(imap_le_struct->imap_stream, folder, (flags ? flags : NIL), (internal_date ? internal_date : NIL), &st)) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto int imap_num_msg(resource stream_id)
+   Gives the number of messages in the current mailbox */
+PHP_FUNCTION(imap_num_msg)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	RETURN_LONG(imap_le_struct->imap_stream->nmsgs);
+}
+/* }}} */
+
+/* {{{ proto bool imap_ping(resource stream_id)
+   Check if the IMAP stream is still active */
+PHP_FUNCTION(imap_ping)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	RETURN_BOOL(mail_ping(imap_le_struct->imap_stream));
+}
+/* }}} */
+
+/* {{{ proto int imap_num_recent(resource stream_id)
+   Gives the number of recent messages in current mailbox */
+PHP_FUNCTION(imap_num_recent)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	RETURN_LONG(imap_le_struct->imap_stream->recent);
+}
+/* }}} */
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+/* {{{ proto array imap_get_quota(resource stream_id, string qroot)
+	Returns the quota set to the mailbox account qroot */
+PHP_FUNCTION(imap_get_quota)
+{
+	zval *streamind;
+	char *qroot;
+	int qroot_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &qroot, &qroot_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	array_init(return_value);
+	IMAPG(quota_return) = &return_value;
+
+	/* set the callback for the GET_QUOTA function */
+	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
+	if (!imap_getquota(imap_le_struct->imap_stream, qroot)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "c-client imap_getquota failed");
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto array imap_get_quotaroot(resource stream_id, string mbox)
+	Returns the quota set to the mailbox account mbox */
+PHP_FUNCTION(imap_get_quotaroot)
+{
+	zval *streamind;
+	char *mbox;
+	int mbox_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &mbox, &mbox_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	array_init(return_value);
+	IMAPG(quota_return) = &return_value;
+
+	/* set the callback for the GET_QUOTAROOT function */
+	mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota);
+	if (!imap_getquotaroot(imap_le_struct->imap_stream, mbox)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "c-client imap_getquotaroot failed");
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_set_quota(resource stream_id, string qroot, int mailbox_size)
+   Will set the quota for qroot mailbox */
+PHP_FUNCTION(imap_set_quota)
+{
+	zval *streamind;
+	char *qroot;
+	int qroot_len;
+	long mailbox_size;
+	pils *imap_le_struct;
+	STRINGLIST	limits;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl", &streamind, &qroot, &qroot_len, &mailbox_size) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	limits.text.data = "STORAGE";
+	limits.text.size = mailbox_size;
+	limits.next = NIL;
+
+	RETURN_BOOL(imap_setquota(imap_le_struct->imap_stream, qroot, &limits));
+}
+/* }}} */
+
+/* {{{ proto bool imap_setacl(resource stream_id, string mailbox, string id, string rights)
+	Sets the ACL for a given mailbox */
+PHP_FUNCTION(imap_setacl)
+{
+	zval *streamind;
+	char *mailbox, *id, *rights;
+	int mailbox_len, id_len, rights_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &streamind, &mailbox, &mailbox_len, &id, &id_len, &rights, &rights_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	RETURN_BOOL(imap_setacl(imap_le_struct->imap_stream, mailbox, id, rights));
+}
+/* }}} */
+
+/* {{{ proto array imap_getacl(resource stream_id, string mailbox)
+	Gets the ACL for a given mailbox */
+PHP_FUNCTION(imap_getacl)
+{
+	zval *streamind;
+	char *mailbox;
+	int mailbox_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &mailbox, &mailbox_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* initializing the special array for the return values */
+	array_init(return_value);
+
+	IMAPG(imap_acl_list) = return_value;
+
+	/* set the callback for the GET_ACL function */
+	mail_parameters(NIL, SET_ACL, (void *) mail_getacl);
+	if (!imap_getacl(imap_le_struct->imap_stream, mailbox)) {
+		php_error(E_WARNING, "c-client imap_getacl failed");
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+
+	IMAPG(imap_acl_list) = NIL;
+}
+/* }}} */
+#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
+
+/* {{{ proto bool imap_expunge(resource stream_id)
+   Permanently delete all messages marked for deletion */
+PHP_FUNCTION(imap_expunge)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	mail_expunge (imap_le_struct->imap_stream);
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool imap_gc(resource stream_id, int flags)
+   This function garbage collects (purges) the cache of entries of a specific type. */
+PHP_FUNCTION(imap_gc)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+	long flags;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~(GC_TEXTS | GC_ELT | GC_ENV)) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the flags parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	mail_gc(imap_le_struct->imap_stream, flags);
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool imap_close(resource stream_id [, int options])
+   Close an IMAP stream */
+PHP_FUNCTION(imap_close)
+{
+	zval *streamind;
+	pils *imap_le_struct=NULL;
+	long options = 0, flags = NIL;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &options) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (argc == 2) {
+		flags = options;
+
+		/* Check that flags is exactly equal to PHP_EXPUNGE or zero */
+		if (flags && ((flags & ~PHP_EXPUNGE) != 0)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the flags parameter");
+			RETURN_FALSE;
+		}
+
+		/* Do the translation from PHP's internal PHP_EXPUNGE define to c-client's CL_EXPUNGE */
+		if (flags & PHP_EXPUNGE) {
+			flags ^= PHP_EXPUNGE;
+			flags |= CL_EXPUNGE;
+		}
+		imap_le_struct->flags = flags;
+	}
+
+	zend_list_delete(Z_RESVAL_P(streamind));
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array imap_headers(resource stream_id)
+   Returns headers for all messages in a mailbox */
+PHP_FUNCTION(imap_headers)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+	unsigned long i;
+	char *t;
+	unsigned int msgno;
+	char tmp[MAILTMPLEN];
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* Initialize return array */
+	array_init(return_value);
+
+	for (msgno = 1; msgno <= imap_le_struct->imap_stream->nmsgs; msgno++) {
+		MESSAGECACHE * cache = mail_elt (imap_le_struct->imap_stream, msgno);
+		mail_fetchstructure(imap_le_struct->imap_stream, msgno, NIL);
+		tmp[0] = cache->recent ? (cache->seen ? 'R': 'N') : ' ';
+		tmp[1] = (cache->recent | cache->seen) ? ' ' : 'U';
+		tmp[2] = cache->flagged ? 'F' : ' ';
+		tmp[3] = cache->answered ? 'A' : ' ';
+		tmp[4] = cache->deleted ? 'D' : ' ';
+		tmp[5] = cache->draft ? 'X' : ' ';
+		snprintf(tmp + 6, sizeof(tmp) - 6, "%4ld) ", cache->msgno);
+		mail_date(tmp+11, cache);
+		tmp[22] = ' ';
+		tmp[23] = '\0';
+		mail_fetchfrom(tmp+23, imap_le_struct->imap_stream, msgno, (long)20);
+		strcat(tmp, " ");
+		if ((i = cache->user_flags)) {
+			strcat(tmp, "{");
+			while (i) {
+				strlcat(tmp, imap_le_struct->imap_stream->user_flags[find_rightmost_bit (&i)], sizeof(tmp));
+				if (i) strlcat(tmp, " ", sizeof(tmp));
+			}
+			strlcat(tmp, "} ", sizeof(tmp));
+		}
+		mail_fetchsubject(t = tmp + strlen(tmp), imap_le_struct->imap_stream, msgno, (long)25);
+		snprintf(t += strlen(t), sizeof(tmp) - strlen(tmp), " (%ld chars)", cache->rfc822_size);
+		add_next_index_string(return_value, tmp, 1);
+	}
+}
+/* }}} */
+
+/* {{{ proto string imap_body(resource stream_id, int msg_no [, int options])
+   Read the message body */
+PHP_FUNCTION(imap_body)
+{
+	zval *streamind;
+	long msgno, flags = 0;
+	pils *imap_le_struct;
+	int msgindex, argc = ZEND_NUM_ARGS();
+	char *body;
+	unsigned long body_len = 0;
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if ((argc == 3) && (flags & FT_UID)) {
+		/* This should be cached; if it causes an extra RTT to the
+		   IMAP server, then that's the price we pay for making
+		   sure we don't crash. */
+		msgindex = mail_msgno(imap_le_struct->imap_stream, msgno);
+	} else {
+		msgindex = msgno;
+	}
+	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		RETURN_FALSE;
+	}
+
+	body = mail_fetchtext_full (imap_le_struct->imap_stream, msgno, &body_len, (argc == 3 ? flags : NIL));
+	if (body_len == 0) {
+		RETVAL_EMPTY_STRING();
+	} else {
+		RETVAL_STRINGL(body, body_len, 1);
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_mail_copy(resource stream_id, string msglist, string mailbox [, int options])
+   Copy specified message to a mailbox */
+PHP_FUNCTION(imap_mail_copy)
+{
+	zval *streamind;
+	long options = 0;
+	char *seq, *folder;
+	int seq_len, folder_len, argc = ZEND_NUM_ARGS();
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_copy_full(imap_le_struct->imap_stream, seq, folder, (argc == 4 ? options : NIL)) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_mail_move(resource stream_id, string sequence, string mailbox [, int options])
+   Move specified message to a mailbox */
+PHP_FUNCTION(imap_mail_move)
+{
+	zval *streamind;
+	char *seq, *folder;
+	int seq_len, folder_len;
+	long options = 0;
+	pils *imap_le_struct;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &seq, &seq_len, &folder, &folder_len, &options) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_copy_full(imap_le_struct->imap_stream, seq, folder, (argc == 4 ? (options | CP_MOVE) : CP_MOVE)) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_createmailbox(resource stream_id, string mailbox)
+   Create a new mailbox */
+PHP_FUNCTION(imap_createmailbox)
+{
+	zval *streamind;
+	char *folder;
+	int folder_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_create(imap_le_struct->imap_stream, folder) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_renamemailbox(resource stream_id, string old_name, string new_name)
+   Rename a mailbox */
+PHP_FUNCTION(imap_renamemailbox)
+{
+	zval *streamind;
+	char *old_mailbox, *new_mailbox;
+	int old_mailbox_len, new_mailbox_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &old_mailbox, &old_mailbox_len, &new_mailbox, &new_mailbox_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_rename(imap_le_struct->imap_stream, old_mailbox, new_mailbox) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_deletemailbox(resource stream_id, string mailbox)
+   Delete a mailbox */
+PHP_FUNCTION(imap_deletemailbox)
+{
+	zval *streamind;
+	char *folder;
+	int folder_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_delete(imap_le_struct->imap_stream, folder) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto array imap_list(resource stream_id, string ref, string pattern)
+   Read the list of mailboxes */
+PHP_FUNCTION(imap_list)
+{
+	zval *streamind;
+	char *ref, *pat;
+	int ref_len, pat_len;
+	pils *imap_le_struct;
+	STRINGLIST *cur=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* set flag for normal, old mailbox list */
+	IMAPG(folderlist_style) = FLIST_ARRAY;
+
+	IMAPG(imap_folders) = IMAPG(imap_folders_tail) = NIL;
+	mail_list(imap_le_struct->imap_stream, ref, pat);
+	if (IMAPG(imap_folders) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	cur=IMAPG(imap_folders);
+	while (cur != NIL) {
+		add_next_index_string(return_value, cur->LTEXT, 1);
+		cur=cur->next;
+	}
+	mail_free_stringlist (&IMAPG(imap_folders));
+	IMAPG(imap_folders) = IMAPG(imap_folders_tail) = NIL;
+}
+
+/* }}} */
+
+/* {{{ proto array imap_getmailboxes(resource stream_id, string ref, string pattern)
+   Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */
+/* Author: CJH */
+PHP_FUNCTION(imap_list_full)
+{
+	zval *streamind, *mboxob;
+	char *ref, *pat;
+	int ref_len, pat_len;
+	pils *imap_le_struct;
+	FOBJECTLIST *cur=NIL;
+	char *delim=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* set flag for new, improved array of objects mailbox list */
+	IMAPG(folderlist_style) = FLIST_OBJECT;
+
+	IMAPG(imap_folder_objects) = IMAPG(imap_folder_objects_tail) = NIL;
+	mail_list(imap_le_struct->imap_stream, ref, pat);
+	if (IMAPG(imap_folder_objects) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	delim = safe_emalloc(2, sizeof(char), 0);
+	cur=IMAPG(imap_folder_objects);
+	while (cur != NIL) {
+		MAKE_STD_ZVAL(mboxob);
+		object_init(mboxob);
+		add_property_string(mboxob, "name", cur->LTEXT, 1);
+		add_property_long(mboxob, "attributes", cur->attributes);
+#ifdef IMAP41
+		delim[0] = (char)cur->delimiter;
+		delim[1] = 0;
+		add_property_string(mboxob, "delimiter", delim, 1);
+#else
+		add_property_string(mboxob, "delimiter", cur->delimiter, 1);
+#endif
+		add_next_index_object(return_value, mboxob TSRMLS_CC);
+		cur=cur->next;
+	}
+	mail_free_foblist(&IMAPG(imap_folder_objects), &IMAPG(imap_folder_objects_tail));
+	efree(delim);
+	IMAPG(folderlist_style) = FLIST_ARRAY;		/* reset to default */
+}
+/* }}} */
+
+/* {{{ proto array imap_listscan(resource stream_id, string ref, string pattern, string content)
+   Read list of mailboxes containing a certain string */
+PHP_FUNCTION(imap_listscan)
+{
+	zval *streamind;
+	char *ref, *pat, *content;
+	int ref_len, pat_len, content_len;
+	pils *imap_le_struct;
+	STRINGLIST *cur=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &streamind, &ref, &ref_len, &pat, &pat_len, &content, &content_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	IMAPG(imap_folders) = NIL;
+	mail_scan(imap_le_struct->imap_stream, ref, pat, content);
+	if (IMAPG(imap_folders) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	cur=IMAPG(imap_folders);
+	while (cur != NIL) {
+		add_next_index_string(return_value, cur->LTEXT, 1);
+		cur=cur->next;
+	}
+	mail_free_stringlist (&IMAPG(imap_folders));
+	IMAPG(imap_folders) = IMAPG(imap_folders_tail) = NIL;
+}
+
+/* }}} */
+
+/* {{{ proto object imap_check(resource stream_id)
+   Get mailbox properties */
+PHP_FUNCTION(imap_check)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+	char date[100];
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_ping (imap_le_struct->imap_stream) == NIL) {
+		RETURN_FALSE;
+	}
+
+	if (imap_le_struct->imap_stream && imap_le_struct->imap_stream->mailbox) {
+		rfc822_date(date);
+		object_init(return_value);
+		add_property_string(return_value, "Date", date, 1);
+		add_property_string(return_value, "Driver", imap_le_struct->imap_stream->dtb->name, 1);
+		add_property_string(return_value, "Mailbox", imap_le_struct->imap_stream->mailbox, 1);
+		add_property_long(return_value, "Nmsgs", imap_le_struct->imap_stream->nmsgs);
+		add_property_long(return_value, "Recent", imap_le_struct->imap_stream->recent);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_delete(resource stream_id, int msg_no [, int options])
+   Mark a message for deletion */
+PHP_FUNCTION(imap_delete)
+{
+	zval *streamind, **sequence;
+	pils *imap_le_struct;
+	long flags = 0;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rZ|l", &streamind, &sequence, &flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(sequence);
+
+	mail_setflag_full(imap_le_struct->imap_stream, Z_STRVAL_PP(sequence), "\\DELETED", (argc == 3 ? flags : NIL));
+	RETVAL_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool imap_undelete(resource stream_id, int msg_no [, int flags])
+   Remove the delete flag from a message */
+PHP_FUNCTION(imap_undelete)
+{
+	zval *streamind, **sequence;
+	long flags = 0;
+	pils *imap_le_struct;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rZ|l", &streamind, &sequence, &flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	convert_to_string_ex(sequence);
+
+	mail_clearflag_full(imap_le_struct->imap_stream, Z_STRVAL_PP(sequence), "\\DELETED", (argc == 3 ? flags : NIL));
+	RETVAL_TRUE;
+}
+/* }}} */
+
+/* {{{ proto object imap_headerinfo(resource stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
+   Read the headers of the message */
+PHP_FUNCTION(imap_headerinfo)
+{
+	zval *streamind;
+	char *defaulthost = NULL;
+	int defaulthost_len = 0, argc = ZEND_NUM_ARGS();
+	long msgno, fromlength, subjectlength;
+	pils *imap_le_struct;
+	MESSAGECACHE *cache;
+	ENVELOPE *en;
+	char dummy[2000], fulladdress[MAILTMPLEN + 1];
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rl|lls", &streamind, &msgno, &fromlength, &subjectlength, &defaulthost, &defaulthost_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (argc >= 3) {
+		if (fromlength < 0 || fromlength > MAILTMPLEN) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "From length has to be between 0 and %d", MAILTMPLEN);
+			RETURN_FALSE;
+		}
+	} else {
+		fromlength = 0x00;
+	}
+	if (argc >= 4) {
+		if (subjectlength < 0 || subjectlength > MAILTMPLEN) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Subject length has to be between 0 and %d", MAILTMPLEN);
+			RETURN_FALSE;
+		}
+	} else {
+		subjectlength = 0x00;
+	}
+
+	PHP_IMAP_CHECK_MSGNO(msgno);
+
+	if (mail_fetchstructure(imap_le_struct->imap_stream, msgno, NIL)) {
+		cache = mail_elt(imap_le_struct->imap_stream, msgno);
+	} else {
+		RETURN_FALSE;
+	}
+
+	en = mail_fetchenvelope(imap_le_struct->imap_stream, msgno);
+
+	/* call a function to parse all the text, so that we can use the
+	   same function to parse text from other sources */
+	_php_make_header_object(return_value, en TSRMLS_CC);
+
+	/* now run through properties that are only going to be returned
+	   from a server, not text headers */
+	add_property_string(return_value, "Recent", cache->recent ? (cache->seen ? "R": "N") : " ", 1);
+	add_property_string(return_value, "Unseen", (cache->recent | cache->seen) ? " " : "U", 1);
+	add_property_string(return_value, "Flagged", cache->flagged ? "F" : " ", 1);
+	add_property_string(return_value, "Answered", cache->answered ? "A" : " ", 1);
+	add_property_string(return_value, "Deleted", cache->deleted ? "D" : " ", 1);
+	add_property_string(return_value, "Draft", cache->draft ? "X" : " ", 1);
+
+	snprintf(dummy, sizeof(dummy), "%4ld", cache->msgno);
+	add_property_string(return_value, "Msgno", dummy, 1);
+
+	mail_date(dummy, cache);
+	add_property_string(return_value, "MailDate", dummy, 1);
+
+	snprintf(dummy, sizeof(dummy), "%ld", cache->rfc822_size);
+	add_property_string(return_value, "Size", dummy, 1);
+
+	add_property_long(return_value, "udate", mail_longdate(cache));
+
+	if (en->from && fromlength) {
+		fulladdress[0] = 0x00;
+		mail_fetchfrom(fulladdress, imap_le_struct->imap_stream, msgno, fromlength);
+		add_property_string(return_value, "fetchfrom", fulladdress, 1);
+	}
+	if (en->subject && subjectlength) {
+		fulladdress[0] = 0x00;
+		mail_fetchsubject(fulladdress, imap_le_struct->imap_stream, msgno, subjectlength);
+		add_property_string(return_value, "fetchsubject", fulladdress, 1);
+	}
+}
+/* }}} */
+
+/* {{{ proto object imap_rfc822_parse_headers(string headers [, string default_host])
+   Parse a set of mail headers contained in a string, and return an object similar to imap_headerinfo() */
+PHP_FUNCTION(imap_rfc822_parse_headers)
+{
+	char *headers, *defaulthost = NULL;
+	ENVELOPE *en;
+	int headers_len, defaulthost_len = 0, argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "s|s", &headers, &headers_len, &defaulthost, &defaulthost_len) == FAILURE) {
+		return;
+	}
+
+	if (argc == 2) {
+		rfc822_parse_msg(&en, NULL, headers, headers_len, NULL, defaulthost, NIL);
+	} else {
+		rfc822_parse_msg(&en, NULL, headers, headers_len, NULL, "UNKNOWN", NIL);
+	}
+
+	/* call a function to parse all the text, so that we can use the
+	   same function no matter where the headers are from */
+	_php_make_header_object(return_value, en TSRMLS_CC);
+	mail_free_envelope(&en);
+}
+/* }}} */
+
+/* KMLANG */
+/* {{{ proto array imap_lsub(resource stream_id, string ref, string pattern)
+   Return a list of subscribed mailboxes */
+PHP_FUNCTION(imap_lsub)
+{
+	zval *streamind;
+	char *ref, *pat;
+	int ref_len, pat_len;
+	pils *imap_le_struct;
+	STRINGLIST *cur=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* set flag for normal, old mailbox list */
+	IMAPG(folderlist_style) = FLIST_ARRAY;
+
+	IMAPG(imap_sfolders) = NIL;
+	mail_lsub(imap_le_struct->imap_stream, ref, pat);
+	if (IMAPG(imap_sfolders) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	cur=IMAPG(imap_sfolders);
+	while (cur != NIL) {
+		add_next_index_string(return_value, cur->LTEXT, 1);
+		cur=cur->next;
+	}
+	mail_free_stringlist (&IMAPG(imap_sfolders));
+	IMAPG(imap_sfolders) = IMAPG(imap_sfolders_tail) = NIL;
+}
+/* }}} */
+
+/* {{{ proto array imap_getsubscribed(resource stream_id, string ref, string pattern)
+   Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */
+/* Author: CJH */
+PHP_FUNCTION(imap_lsub_full)
+{
+	zval *streamind, *mboxob;
+	char *ref, *pat;
+	int ref_len, pat_len;
+	pils *imap_le_struct;
+	FOBJECTLIST *cur=NIL;
+	char *delim=NIL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &streamind, &ref, &ref_len, &pat, &pat_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* set flag for new, improved array of objects list */
+	IMAPG(folderlist_style) = FLIST_OBJECT;
+
+	IMAPG(imap_sfolder_objects) = IMAPG(imap_sfolder_objects_tail) = NIL;
+	mail_lsub(imap_le_struct->imap_stream, ref, pat);
+	if (IMAPG(imap_sfolder_objects) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	delim = safe_emalloc(2, sizeof(char), 0);
+	cur=IMAPG(imap_sfolder_objects);
+	while (cur != NIL) {
+		MAKE_STD_ZVAL(mboxob);
+		object_init(mboxob);
+		add_property_string(mboxob, "name", cur->LTEXT, 1);
+		add_property_long(mboxob, "attributes", cur->attributes);
+#ifdef IMAP41
+		delim[0] = (char)cur->delimiter;
+		delim[1] = 0;
+		add_property_string(mboxob, "delimiter", delim, 1);
+#else
+		add_property_string(mboxob, "delimiter", cur->delimiter, 1);
+#endif
+		add_next_index_object(return_value, mboxob TSRMLS_CC);
+		cur=cur->next;
+	}
+	mail_free_foblist (&IMAPG(imap_sfolder_objects), &IMAPG(imap_sfolder_objects_tail));
+	efree(delim);
+	IMAPG(folderlist_style) = FLIST_ARRAY; /* reset to default */
+}
+/* }}} */
+
+/* {{{ proto bool imap_subscribe(resource stream_id, string mailbox)
+   Subscribe to a mailbox */
+PHP_FUNCTION(imap_subscribe)
+{
+	zval *streamind;
+	char *folder;
+	int folder_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_subscribe(imap_le_struct->imap_stream, folder) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto bool imap_unsubscribe(resource stream_id, string mailbox)
+   Unsubscribe from a mailbox */
+PHP_FUNCTION(imap_unsubscribe)
+{
+	zval *streamind;
+	char *folder;
+	int folder_len;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &streamind, &folder, &folder_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (mail_unsubscribe(imap_le_struct->imap_stream, folder) == T) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto object imap_fetchstructure(resource stream_id, int msg_no [, int options])
+   Read the full structure of a message */
+PHP_FUNCTION(imap_fetchstructure)
+{
+	zval *streamind;
+	long msgno, flags = 0;
+	pils *imap_le_struct;
+	BODY *body;
+	int msgindex, argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~FT_UID) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (msgno < 1) {
+		RETURN_FALSE;
+	}
+
+	object_init(return_value);
+
+	if ((argc == 3) && (flags & FT_UID)) {
+		/* This should be cached; if it causes an extra RTT to the
+		   IMAP server, then that's the price we pay for making
+		   sure we don't crash. */
+		msgindex = mail_msgno(imap_le_struct->imap_stream, msgno);
+	} else {
+		msgindex = msgno;
+	}
+	PHP_IMAP_CHECK_MSGNO(msgindex);
+
+	mail_fetchstructure_full(imap_le_struct->imap_stream, msgno, &body , (argc == 3 ? flags : NIL));
+
+	if (!body) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body information available");
+		RETURN_FALSE;
+	}
+
+	_php_imap_add_body(return_value, body TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto string imap_fetchbody(resource stream_id, int msg_no, string section [, int options])
+   Get a specific body section */
+PHP_FUNCTION(imap_fetchbody)
+{
+	zval *streamind;
+	long msgno, flags = 0;
+	pils *imap_le_struct;
+	char *body, *sec;
+	int sec_len;
+	unsigned long len;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (argc < 4 || !(flags & FT_UID)) {
+		/* only perform the check if the msgno is a message number and not a UID */
+		PHP_IMAP_CHECK_MSGNO(msgno);
+	}
+
+	body = mail_fetchbody_full(imap_le_struct->imap_stream, msgno, sec, &len, (argc == 4 ? flags : NIL));
+
+	if (!body) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body information available");
+		RETURN_FALSE;
+	}
+	RETVAL_STRINGL(body, len, 1);
+}
+
+/* }}} */
+
+
+/* {{{ proto string imap_fetchmime(resource stream_id, int msg_no, string section [, int options])
+   Get a specific body section's MIME headers */
+PHP_FUNCTION(imap_fetchmime)
+{
+	zval *streamind;
+	long msgno, flags = 0;
+	pils *imap_le_struct;
+	char *body, *sec;
+	int sec_len;
+	unsigned long len;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rls|l", &streamind, &msgno, &sec, &sec_len, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (argc < 4 || !(flags & FT_UID)) {
+		/* only perform the check if the msgno is a message number and not a UID */
+		PHP_IMAP_CHECK_MSGNO(msgno);
+	}
+
+	body = mail_fetch_mime(imap_le_struct->imap_stream, msgno, sec, &len, (argc == 4 ? flags : NIL));
+
+	if (!body) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No body MIME information available");
+		RETURN_FALSE;
+	}
+	RETVAL_STRINGL(body, len, 1);
+}
+
+/* }}} */
+
+/* {{{ proto bool imap_savebody(resource stream_id, string|resource file, int msg_no[, string section = ""[, int options = 0]])
+	Save a specific body section to a file */
+PHP_FUNCTION(imap_savebody)
+{
+	zval *stream, **out;
+	pils *imap_ptr = NULL;
+	php_stream *writer = NULL;
+	char *section = "";
+	int section_len = 0, close_stream = 1;
+	long msgno, flags = 0;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZl|sl", &stream, &out, &msgno, &section, &section_len, &flags)) {
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_ptr, pils *, &stream, -1, "imap", le_imap);
+
+	if (!imap_ptr) {
+		RETURN_FALSE;
+	}
+
+	switch (Z_TYPE_PP(out))
+	{
+		case IS_LONG:
+		case IS_RESOURCE:
+			close_stream = 0;
+			php_stream_from_zval(writer, out);
+		break;
+
+		default:
+			convert_to_string_ex(out);
+			writer = php_stream_open_wrapper(Z_STRVAL_PP(out), "wb", REPORT_ERRORS, NULL);
+		break;
+	}
+
+	if (!writer) {
+		RETURN_FALSE;
+	}
+
+	IMAPG(gets_stream) = writer;
+	mail_parameters(NIL, SET_GETS, (void *) php_mail_gets);
+	mail_fetchbody_full(imap_ptr->imap_stream, msgno, section, NULL, flags);
+	mail_parameters(NIL, SET_GETS, (void *) NULL);
+	IMAPG(gets_stream) = NULL;
+
+	if (close_stream) {
+		php_stream_close(writer);
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string imap_base64(string text)
+   Decode BASE64 encoded text */
+PHP_FUNCTION(imap_base64)
+{
+	char *text, *decode;
+	int text_len;
+	unsigned long newlength;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+		return;
+	}
+
+	decode = (char *) rfc822_base64((unsigned char *) text, text_len, &newlength);
+
+	if (decode == NULL) {
+		RETURN_FALSE;
+	}
+
+	RETVAL_STRINGL(decode, newlength, 1);
+	fs_give((void**) &decode);
+}
+/* }}} */
+
+/* {{{ proto string imap_qprint(string text)
+   Convert a quoted-printable string to an 8-bit string */
+PHP_FUNCTION(imap_qprint)
+{
+	char *text, *decode;
+	int text_len;
+	unsigned long newlength;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+		return;
+	}
+
+	decode = (char *) rfc822_qprint((unsigned char *) text, text_len, &newlength);
+
+	if (decode == NULL) {
+		RETURN_FALSE;
+	}
+
+	RETVAL_STRINGL(decode, newlength, 1);
+	fs_give((void**) &decode);
+}
+/* }}} */
+
+/* {{{ proto string imap_8bit(string text)
+   Convert an 8-bit string to a quoted-printable string */
+PHP_FUNCTION(imap_8bit)
+{
+	char *text, *decode;
+	int text_len;
+	unsigned long newlength;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+		return;
+	}
+
+	decode = (char *) rfc822_8bit((unsigned char *) text, text_len, &newlength);
+
+	if (decode == NULL) {
+		RETURN_FALSE;
+	}
+
+	RETVAL_STRINGL(decode, newlength, 1);
+	fs_give((void**) &decode);
+}
+/* }}} */
+
+/* {{{ proto string imap_binary(string text)
+   Convert an 8bit string to a base64 string */
+PHP_FUNCTION(imap_binary)
+{
+	char *text, *decode;
+	int text_len;
+	unsigned long newlength;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &text, &text_len) == FAILURE) {
+		return;
+	}
+
+	decode = rfc822_binary(text, text_len, &newlength);
+
+	if (decode == NULL) {
+		RETURN_FALSE;
+	}
+
+	RETVAL_STRINGL(decode, newlength, 1);
+	fs_give((void**) &decode);
+}
+/* }}} */
+
+/* {{{ proto object imap_mailboxmsginfo(resource stream_id)
+   Returns info about the current mailbox */
+PHP_FUNCTION(imap_mailboxmsginfo)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+	char date[100];
+	unsigned int msgno, unreadmsg, deletedmsg, msize;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &streamind) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	/* Initialize return object */
+	object_init(return_value);
+
+	unreadmsg = 0;
+	deletedmsg = 0;
+	msize = 0;
+
+	for (msgno = 1; msgno <= imap_le_struct->imap_stream->nmsgs; msgno++) {
+		MESSAGECACHE * cache = mail_elt (imap_le_struct->imap_stream, msgno);
+		mail_fetchstructure (imap_le_struct->imap_stream, msgno, NIL);
+
+		if (!cache->seen || cache->recent) {
+			unreadmsg++;
+		}
+
+		if (cache->deleted) {
+			deletedmsg++;
+		}
+		msize = msize + cache->rfc822_size;
+	}
+	add_property_long(return_value, "Unread", unreadmsg);
+	add_property_long(return_value, "Deleted", deletedmsg);
+	add_property_long(return_value, "Nmsgs", imap_le_struct->imap_stream->nmsgs);
+	add_property_long(return_value, "Size", msize);
+	rfc822_date(date);
+	add_property_string(return_value, "Date", date, 1);
+	add_property_string(return_value, "Driver", imap_le_struct->imap_stream->dtb->name, 1);
+	add_property_string(return_value, "Mailbox", imap_le_struct->imap_stream->mailbox, 1);
+	add_property_long(return_value, "Recent", imap_le_struct->imap_stream->recent);
+}
+/* }}} */
+
+/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal)
+   Returns a properly formatted email address given the mailbox, host, and personal info */
+PHP_FUNCTION(imap_rfc822_write_address)
+{
+	char *mailbox, *host, *personal;
+	int mailbox_len, host_len, personal_len;
+	ADDRESS *addr;
+	char *string;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &mailbox, &mailbox_len, &host, &host_len, &personal, &personal_len) == FAILURE) {
+		return;
+	}
+
+	addr=mail_newaddr();
+
+	if (mailbox) {
+		addr->mailbox = cpystr(mailbox);
+	}
+
+	if (host) {
+		addr->host = cpystr(host);
+	}
+
+	if (personal) {
+		addr->personal = cpystr(personal);
+	}
+
+	addr->next=NIL;
+	addr->error=NIL;
+	addr->adl=NIL;
+
+	string = _php_rfc822_write_address(addr TSRMLS_CC);
+	if (string) {
+		RETVAL_STRING(string, 0);
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host)
+   Parses an address string */
+PHP_FUNCTION(imap_rfc822_parse_adrlist)
+{
+	zval *tovals;
+	char *str, *defaulthost, *str_copy;
+	int str_len, defaulthost_len;
+	ADDRESS *addresstmp;
+	ENVELOPE *env;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &str, &str_len, &defaulthost, &defaulthost_len) == FAILURE) {
+		return;
+	}
+
+	env = mail_newenvelope();
+
+	/* rfc822_parse_adrlist() modifies passed string. Copy it. */
+	str_copy = estrndup(str, str_len);
+	rfc822_parse_adrlist(&env->to, str_copy, defaulthost);
+	efree(str_copy);
+
+	array_init(return_value);
+
+	addresstmp = env->to;
+
+	if (addresstmp) do {
+		MAKE_STD_ZVAL(tovals);
+		object_init(tovals);
+		if (addresstmp->mailbox) {
+			add_property_string(tovals, "mailbox", addresstmp->mailbox, 1);
+		}
+		if (addresstmp->host) {
+			add_property_string(tovals, "host", addresstmp->host, 1);
+		}
+		if (addresstmp->personal) {
+			add_property_string(tovals, "personal", addresstmp->personal, 1);
+		}
+		if (addresstmp->adl) {
+			add_property_string(tovals, "adl", addresstmp->adl, 1);
+		}
+		add_next_index_object(return_value, tovals TSRMLS_CC);
+	} while ((addresstmp = addresstmp->next));
+
+	mail_free_envelope(&env);
+}
+/* }}} */
+
+/* {{{ proto string imap_utf8(string mime_encoded_text)
+   Convert a mime-encoded text to UTF-8 */
+PHP_FUNCTION(imap_utf8)
+{
+	char *str;
+	int str_len;
+	SIZEDTEXT src, dest;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+		return;
+	}
+
+	src.data  = NULL;
+	src.size  = 0;
+	dest.data = NULL;
+	dest.size = 0;
+
+	cpytxt(&src, str, str_len);
+
+#ifndef HAVE_NEW_MIME2TEXT
+	utf8_mime2text(&src, &dest);
+#else
+	utf8_mime2text(&src, &dest, U8T_DECOMPOSE);
+#endif
+	RETVAL_STRINGL(dest.data, dest.size, 1);
+	if (dest.data) {
+		free(dest.data);
+	}
+	if (src.data && src.data != dest.data) {
+		free(src.data);
+	}
+}
+/* }}} */
+
+/* {{{ macros for the modified utf7 conversion functions
+ *
+ * author: Andrew Skalski <askalski@chek.com>
+ */
+
+/* tests `c' and returns true if it is a special character */
+#define SPECIAL(c) ((c) <= 0x1f || (c) >= 0x7f)
+
+/* validate a modified-base64 character */
+#define B64CHAR(c) (isalnum(c) || (c) == '+' || (c) == ',')
+
+/* map the low 64 bits of `n' to the modified-base64 characters */
+#define B64(n)	("ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+				"abcdefghijklmnopqrstuvwxyz0123456789+,"[(n) & 0x3f])
+
+/* map the modified-base64 character `c' to its 64 bit value */
+#define UNB64(c)	((c) == '+' ? 62 : (c) == ',' ? 63 : (c) >= 'a' ? \
+					(c) - 71 : (c) >= 'A' ? (c) - 65 : (c) + 4)
+/* }}} */
+
+/* {{{ proto string imap_utf7_decode(string buf)
+   Decode a modified UTF-7 string */
+PHP_FUNCTION(imap_utf7_decode)
+{
+	/* author: Andrew Skalski <askalski@chek.com> */
+	char *arg;
+	const unsigned char *in, *inp, *endp;
+	unsigned char *out, *outp;
+	unsigned char c;
+	int arg_len, inlen, outlen;
+	enum {
+		ST_NORMAL,	/* printable text */
+		ST_DECODE0,	/* encoded text rotation... */
+		ST_DECODE1,
+		ST_DECODE2,
+		ST_DECODE3
+	} state;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
+		return;
+	}
+
+	in = (const unsigned char *) arg;
+	inlen = arg_len;
+
+	/* validate and compute length of output string */
+	outlen = 0;
+	state = ST_NORMAL;
+	for (endp = (inp = in) + inlen; inp < endp; inp++) {
+		if (state == ST_NORMAL) {
+			/* process printable character */
+			if (SPECIAL(*inp)) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid modified UTF-7 character: `%c'", *inp);
+				RETURN_FALSE;
+			} else if (*inp != '&') {
+				outlen++;
+			} else if (inp + 1 == endp) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected end of string");
+				RETURN_FALSE;
+			} else if (inp[1] != '-') {
+				state = ST_DECODE0;
+			} else {
+				outlen++;
+				inp++;
+			}
+		} else if (*inp == '-') {
+			/* return to NORMAL mode */
+			if (state == ST_DECODE1) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Stray modified base64 character: `%c'", *--inp);
+				RETURN_FALSE;
+			}
+			state = ST_NORMAL;
+		} else if (!B64CHAR(*inp)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid modified base64 character: `%c'", *inp);
+			RETURN_FALSE;
+		} else {
+			switch (state) {
+				case ST_DECODE3:
+					outlen++;
+					state = ST_DECODE0;
+					break;
+				case ST_DECODE2:
+				case ST_DECODE1:
+					outlen++;
+				case ST_DECODE0:
+					state++;
+				case ST_NORMAL:
+					break;
+			}
+		}
+	}
+
+	/* enforce end state */
+	if (state != ST_NORMAL) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unexpected end of string");
+		RETURN_FALSE;
+	}
+
+	/* allocate output buffer */
+	out = emalloc(outlen + 1);
+
+	/* decode input string */
+	outp = out;
+	state = ST_NORMAL;
+	for (endp = (inp = in) + inlen; inp < endp; inp++) {
+		if (state == ST_NORMAL) {
+			if (*inp == '&' && inp[1] != '-') {
+				state = ST_DECODE0;
+			}
+			else if ((*outp++ = *inp) == '&') {
+				inp++;
+			}
+		}
+		else if (*inp == '-') {
+			state = ST_NORMAL;
+		}
+		else {
+			/* decode input character */
+			switch (state) {
+			case ST_DECODE0:
+				*outp = UNB64(*inp) << 2;
+				state = ST_DECODE1;
+				break;
+			case ST_DECODE1:
+				outp[1] = UNB64(*inp);
+				c = outp[1] >> 4;
+				*outp++ |= c;
+				*outp <<= 4;
+				state = ST_DECODE2;
+				break;
+			case ST_DECODE2:
+				outp[1] = UNB64(*inp);
+				c = outp[1] >> 2;
+				*outp++ |= c;
+				*outp <<= 6;
+				state = ST_DECODE3;
+				break;
+			case ST_DECODE3:
+				*outp++ |= UNB64(*inp);
+				state = ST_DECODE0;
+			case ST_NORMAL:
+				break;
+			}
+		}
+	}
+
+	*outp = 0;
+
+#if PHP_DEBUG
+	/* warn if we computed outlen incorrectly */
+	if (outp - out != outlen) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "outp - out [%ld] != outlen [%d]", outp - out, outlen);
+	}
+#endif
+
+	RETURN_STRINGL(out, outlen, 0);
+}
+/* }}} */
+
+/* {{{ proto string imap_utf7_encode(string buf)
+   Encode a string in modified UTF-7 */
+PHP_FUNCTION(imap_utf7_encode)
+{
+	/* author: Andrew Skalski <askalski@chek.com> */
+	char *arg;
+	const unsigned char *in, *inp, *endp;
+	unsigned char *out, *outp;
+	unsigned char c;
+	int arg_len, inlen, outlen;
+	enum {
+		ST_NORMAL,	/* printable text */
+		ST_ENCODE0,	/* encoded text rotation... */
+		ST_ENCODE1,
+		ST_ENCODE2
+	} state;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) {
+		return;
+	}
+
+	in = (const unsigned char *) arg;
+	inlen = arg_len;
+
+	/* compute the length of the result string */
+	outlen = 0;
+	state = ST_NORMAL;
+	endp = (inp = in) + inlen;
+	while (inp < endp) {
+		if (state == ST_NORMAL) {
+			if (SPECIAL(*inp)) {
+				state = ST_ENCODE0;
+				outlen++;
+			} else if (*inp++ == '&') {
+				outlen++;
+			}
+			outlen++;
+		} else if (!SPECIAL(*inp)) {
+			state = ST_NORMAL;
+		} else {
+			/* ST_ENCODE0 -> ST_ENCODE1	- two chars
+			 * ST_ENCODE1 -> ST_ENCODE2	- one char
+			 * ST_ENCODE2 -> ST_ENCODE0	- one char
+			 */
+			if (state == ST_ENCODE2) {
+				state = ST_ENCODE0;
+			}
+			else if (state++ == ST_ENCODE0) {
+				outlen++;
+			}
+			outlen++;
+			inp++;
+		}
+	}
+
+	/* allocate output buffer */
+	out = emalloc(outlen + 1);
+
+	/* encode input string */
+	outp = out;
+	state = ST_NORMAL;
+	endp = (inp = in) + inlen;
+	while (inp < endp || state != ST_NORMAL) {
+		if (state == ST_NORMAL) {
+			if (SPECIAL(*inp)) {
+				/* begin encoding */
+				*outp++ = '&';
+				state = ST_ENCODE0;
+			} else if ((*outp++ = *inp++) == '&') {
+				*outp++ = '-';
+			}
+		} else if (inp == endp || !SPECIAL(*inp)) {
+			/* flush overflow and terminate region */
+			if (state != ST_ENCODE0) {
+				c = B64(*outp);
+				*outp++ = c;
+			}
+			*outp++ = '-';
+			state = ST_NORMAL;
+		} else {
+			/* encode input character */
+			switch (state) {
+				case ST_ENCODE0:
+					*outp++ = B64(*inp >> 2);
+					*outp = *inp++ << 4;
+					state = ST_ENCODE1;
+					break;
+				case ST_ENCODE1:
+					c = B64(*outp | *inp >> 4);
+					*outp++ = c;
+					*outp = *inp++ << 2;
+					state = ST_ENCODE2;
+					break;
+				case ST_ENCODE2:
+					c = B64(*outp | *inp >> 6);
+					*outp++ = c;
+					*outp++ = B64(*inp++);
+					state = ST_ENCODE0;
+				case ST_NORMAL:
+					break;
+			}
+		}
+	}
+
+	*outp = 0;
+
+#if PHP_DEBUG
+	/* warn if we computed outlen incorrectly */
+	if (outp - out != outlen) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "outp - out [%ld] != outlen [%d]", outp - out, outlen);
+	}
+#endif
+
+	RETURN_STRINGL(out, outlen, 0);
+}
+/* }}} */
+
+#undef SPECIAL
+#undef B64CHAR
+#undef B64
+#undef UNB64
+
+#ifdef HAVE_IMAP_MUTF7
+static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
+{
+	char *in;
+	int in_len;
+	unsigned char *out;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &in, &in_len) == FAILURE) {
+		return;
+	}
+
+	if (in_len < 1) {
+		RETURN_EMPTY_STRING();
+	}
+
+	if (mode == 0) {
+		out = utf8_to_mutf7((unsigned char *) in);
+	} else {
+		out = utf8_from_mutf7((unsigned char *) in);
+	}
+
+	if (out == NIL) {
+		RETURN_FALSE;
+	} else {
+		RETURN_STRING((char *)out, 1);
+	}
+}
+/* }}} */
+
+/* {{{ proto string imap_utf8_to_mutf7(string in)
+   Encode a UTF-8 string to modified UTF-7 */
+PHP_FUNCTION(imap_utf8_to_mutf7)
+{
+	php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto string imap_mutf7_to_utf8(string in)
+   Decode a modified UTF-7 string to UTF-8 */
+PHP_FUNCTION(imap_mutf7_to_utf8)
+{
+	php_imap_mutf7(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+#endif
+
+/* {{{ proto bool imap_setflag_full(resource stream_id, string sequence, string flag [, int options])
+   Sets flags on messages */
+PHP_FUNCTION(imap_setflag_full)
+{
+	zval *streamind;
+	char *sequence, *flag;
+	int sequence_len, flag_len;
+	long flags = 0;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	mail_setflag_full(imap_le_struct->imap_stream, sequence, flag, (flags ? flags : NIL));
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool imap_clearflag_full(resource stream_id, string sequence, string flag [, int options])
+   Clears flags on messages */
+PHP_FUNCTION(imap_clearflag_full)
+{
+	zval *streamind;
+	char *sequence, *flag;
+	int sequence_len, flag_len;
+	long flags = 0;
+	pils *imap_le_struct;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rss|l", &streamind, &sequence, &sequence_len, &flag, &flag_len, &flags) ==FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	mail_clearflag_full(imap_le_struct->imap_stream, sequence, flag, (argc == 4 ? flags : NIL));
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array imap_sort(resource stream_id, int criteria, int reverse [, int options [, string search_criteria [, string charset]]])
+   Sort an array of message headers, optionally including only messages that meet specified criteria. */
+PHP_FUNCTION(imap_sort)
+{
+	zval *streamind;
+	char *criteria = NULL, *charset = NULL;
+	int criteria_len, charset_len;
+	long pgm, rev, flags = 0;
+	pils *imap_le_struct;
+	unsigned long *slst, *sl;
+	char *search_criteria;
+	SORTPGM *mypgm=NIL;
+	SEARCHPGM *spg=NIL;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rll|lss", &streamind, &pgm, &rev, &flags, &criteria, &criteria_len, &charset, &charset_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (pgm > SORTSIZE) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized sort criteria");
+		RETURN_FALSE;
+	}
+	if (argc >= 4) {
+		if (flags < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Search options parameter has to be greater than or equal to 0");
+			RETURN_FALSE;
+		}
+	}
+	if (argc >= 5) {
+		search_criteria = estrndup(criteria, criteria_len);
+		spg = mail_criteria(search_criteria);
+		efree(search_criteria);
+	} else {
+		spg = mail_newsearchpgm();
+	}
+
+	mypgm = mail_newsortpgm();
+	mypgm->reverse = rev;
+	mypgm->function = (short) pgm;
+	mypgm->next = NIL;
+
+	slst = mail_sort(imap_le_struct->imap_stream, (argc == 6 ? charset : NIL), spg, mypgm, (argc >= 4 ? flags : NIL));
+
+	if (spg && !(flags & SE_FREE)) {
+		mail_free_searchpgm(&spg);
+	}
+
+	array_init(return_value);
+	if (slst != NIL && slst != 0) {
+		for (sl = slst; *sl; sl++) {
+			add_next_index_long(return_value, *sl);
+		}
+		fs_give ((void **) &slst);
+	}
+}
+/* }}} */
+
+/* {{{ proto string imap_fetchheader(resource stream_id, int msg_no [, int options])
+   Get the full unfiltered header for a message */
+PHP_FUNCTION(imap_fetchheader)
+{
+	zval *streamind;
+	long msgno, flags=0L;
+	pils *imap_le_struct;
+	int msgindex, argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if ((argc == 3) && (flags & FT_UID)) {
+		/* This should be cached; if it causes an extra RTT to the
+		   IMAP server, then that's the price we pay for making sure
+		   we don't crash. */
+		msgindex = mail_msgno(imap_le_struct->imap_stream, msgno);
+	} else {
+		msgindex = msgno;
+	}
+
+	PHP_IMAP_CHECK_MSGNO(msgindex);
+
+	RETVAL_STRING(mail_fetchheader_full(imap_le_struct->imap_stream, msgno, NIL, NIL, (argc == 3 ? flags : NIL)), 1);
+}
+/* }}} */
+
+/* {{{ proto int imap_uid(resource stream_id, int msg_no)
+   Get the unique message id associated with a standard sequential message number */
+PHP_FUNCTION(imap_uid)
+{
+	zval *streamind;
+	long msgno;
+	pils *imap_le_struct;
+	int msgindex;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &msgno) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	msgindex = msgno;
+	if ((msgindex < 1) || ((unsigned) msgindex > imap_le_struct->imap_stream->nmsgs)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		RETURN_FALSE;
+	}
+
+	RETURN_LONG(mail_uid(imap_le_struct->imap_stream, msgno));
+}
+/* }}} */
+
+/* {{{ proto int imap_msgno(resource stream_id, int unique_msg_id)
+   Get the sequence number associated with a UID */
+PHP_FUNCTION(imap_msgno)
+{
+	zval *streamind;
+	long msgno;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &streamind, &msgno) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, msgno));
+}
+/* }}} */
+
+/* {{{ proto object imap_status(resource stream_id, string mailbox, int options)
+   Get status info from a mailbox */
+PHP_FUNCTION(imap_status)
+{
+	zval *streamind;
+	char *mbx;
+	int mbx_len;
+	long flags;
+	pils *imap_le_struct;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsl", &streamind, &mbx, &mbx_len, &flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	object_init(return_value);
+
+	if (mail_status(imap_le_struct->imap_stream, mbx, flags)) {
+		add_property_long(return_value, "flags", IMAPG(status_flags));
+		if (IMAPG(status_flags) & SA_MESSAGES) {
+			add_property_long(return_value, "messages", IMAPG(status_messages));
+		}
+		if (IMAPG(status_flags) & SA_RECENT) {
+			add_property_long(return_value, "recent", IMAPG(status_recent));
+		}
+		if (IMAPG(status_flags) & SA_UNSEEN) {
+			add_property_long(return_value, "unseen", IMAPG(status_unseen));
+		}
+		if (IMAPG(status_flags) & SA_UIDNEXT) {
+			add_property_long(return_value, "uidnext", IMAPG(status_uidnext));
+		}
+		if (IMAPG(status_flags) & SA_UIDVALIDITY) {
+			add_property_long(return_value, "uidvalidity", IMAPG(status_uidvalidity));
+		}
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto object imap_bodystruct(resource stream_id, int msg_no, string section)
+   Read the structure of a specified body section of a specific message */
+PHP_FUNCTION(imap_bodystruct)
+{
+	zval *streamind;
+	long msg;
+	char *section;
+	int section_len;
+	pils *imap_le_struct;
+	zval *parametres, *param, *dparametres, *dparam;
+	PARAMETER *par, *dpar;
+	BODY *body;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &streamind, &msg, &section, &section_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	if (!msg || msg < 1 || (unsigned) msg > imap_le_struct->imap_stream->nmsgs) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad message number");
+		RETURN_FALSE;
+	}
+
+	object_init(return_value);
+
+	body=mail_body(imap_le_struct->imap_stream, msg, section);
+	if (body == NULL) {
+		zval_dtor(return_value);
+		RETURN_FALSE;
+	}
+	if (body->type <= TYPEMAX) {
+		add_property_long(return_value, "type", body->type);
+	}
+	if (body->encoding <= ENCMAX) {
+		add_property_long(return_value, "encoding", body->encoding);
+	}
+
+	if (body->subtype) {
+		add_property_long(return_value, "ifsubtype", 1);
+		add_property_string(return_value, "subtype", body->subtype, 1);
+	} else {
+		add_property_long(return_value, "ifsubtype", 0);
+	}
+
+	if (body->description) {
+		add_property_long(return_value, "ifdescription", 1);
+		add_property_string(return_value, "description", body->description, 1);
+	} else {
+		add_property_long(return_value, "ifdescription", 0);
+	}
+	if (body->id) {
+		add_property_long(return_value, "ifid", 1);
+		add_property_string(return_value, "id", body->id, 1);
+	} else {
+		add_property_long(return_value, "ifid", 0);
+	}
+
+	if (body->size.lines) {
+		add_property_long(return_value, "lines", body->size.lines);
+	}
+	if (body->size.bytes) {
+		add_property_long(return_value, "bytes", body->size.bytes);
+	}
+#ifdef IMAP41
+	if (body->disposition.type) {
+		add_property_long(return_value, "ifdisposition", 1);
+		add_property_string(return_value, "disposition", body->disposition.type, 1);
+	} else {
+		add_property_long(return_value, "ifdisposition", 0);
+	}
+
+	if (body->disposition.parameter) {
+		dpar = body->disposition.parameter;
+		add_property_long(return_value, "ifdparameters", 1);
+		MAKE_STD_ZVAL(dparametres);
+		array_init(dparametres);
+		do {
+			MAKE_STD_ZVAL(dparam);
+			object_init(dparam);
+			add_property_string(dparam, "attribute", dpar->attribute, 1);
+			add_property_string(dparam, "value", dpar->value, 1);
+			add_next_index_object(dparametres, dparam TSRMLS_CC);
+		} while ((dpar = dpar->next));
+		add_assoc_object(return_value, "dparameters", dparametres TSRMLS_CC);
+	} else {
+		add_property_long(return_value, "ifdparameters", 0);
+	}
+#endif
+
+	if ((par = body->parameter)) {
+		add_property_long(return_value, "ifparameters", 1);
+
+		MAKE_STD_ZVAL(parametres);
+		array_init(parametres);
+		do {
+			MAKE_STD_ZVAL(param);
+			object_init(param);
+			if (par->attribute) {
+				add_property_string(param, "attribute", par->attribute, 1);
+			}
+			if (par->value) {
+				add_property_string(param, "value", par->value, 1);
+			}
+
+			add_next_index_object(parametres, param TSRMLS_CC);
+		} while ((par = par->next));
+	} else {
+		MAKE_STD_ZVAL(parametres);
+		object_init(parametres);
+		add_property_long(return_value, "ifparameters", 0);
+	}
+	add_assoc_object(return_value, "parameters", parametres TSRMLS_CC);
+}
+
+/* }}} */
+
+/* {{{ proto array imap_fetch_overview(resource stream_id, string sequence [, int options])
+   Read an overview of the information in the headers of the given message sequence */
+PHP_FUNCTION(imap_fetch_overview)
+{
+	zval *streamind;
+	char *sequence;
+	int sequence_len;
+	pils *imap_le_struct;
+	zval *myoverview;
+	char *address;
+	long status, flags = 0L;
+	int argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &streamind, &sequence, &sequence_len, &flags) == FAILURE) {
+		return;
+	}
+
+	if (flags && ((flags & ~FT_UID) != 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	array_init(return_value);
+
+	status = (flags & FT_UID)
+		? mail_uid_sequence(imap_le_struct->imap_stream, sequence)
+		: mail_sequence(imap_le_struct->imap_stream, sequence);
+
+	if (status) {
+		MESSAGECACHE *elt;
+		ENVELOPE *env;
+		unsigned long i;
+
+		for (i = 1; i <= imap_le_struct->imap_stream->nmsgs; i++) {
+			if (((elt = mail_elt (imap_le_struct->imap_stream, i))->sequence) &&
+				(env = mail_fetch_structure (imap_le_struct->imap_stream, i, NIL, NIL))) {
+				MAKE_STD_ZVAL(myoverview);
+				object_init(myoverview);
+				if (env->subject) {
+					add_property_string(myoverview, "subject", env->subject, 1);
+				}
+				if (env->from) {
+					env->from->next=NULL;
+					address =_php_rfc822_write_address(env->from TSRMLS_CC);
+					if (address) {
+						add_property_string(myoverview, "from", address, 0);
+					}
+				}
+				if (env->to) {
+					env->to->next = NULL;
+					address = _php_rfc822_write_address(env->to TSRMLS_CC);
+					if (address) {
+						add_property_string(myoverview, "to", address, 0);
+					}
+				}
+				if (env->date) {
+					add_property_string(myoverview, "date", env->date, 1);
+				}
+				if (env->message_id) {
+					add_property_string(myoverview, "message_id", env->message_id, 1);
+				}
+				if (env->references) {
+					add_property_string(myoverview, "references", env->references, 1);
+				}
+				if (env->in_reply_to) {
+					add_property_string(myoverview, "in_reply_to", env->in_reply_to, 1);
+				}
+				add_property_long(myoverview, "size", elt->rfc822_size);
+				add_property_long(myoverview, "uid", mail_uid(imap_le_struct->imap_stream, i));
+				add_property_long(myoverview, "msgno", i);
+				add_property_long(myoverview, "recent", elt->recent);
+				add_property_long(myoverview, "flagged", elt->flagged);
+				add_property_long(myoverview, "answered", elt->answered);
+				add_property_long(myoverview, "deleted", elt->deleted);
+				add_property_long(myoverview, "seen", elt->seen);
+				add_property_long(myoverview, "draft", elt->draft);
+				add_property_long(myoverview, "udate", mail_longdate(elt));
+				add_next_index_object(return_value, myoverview TSRMLS_CC);
+			}
+		}
+	}
+}
+/* }}} */
+
+/* {{{ proto string imap_mail_compose(array envelope, array body)
+   Create a MIME message based on given envelope and body sections */
+PHP_FUNCTION(imap_mail_compose)
+{
+	zval *envelope, *body;
+	char *key;
+	zval **data, **pvalue, **disp_data, **env_data;
+	ulong ind;
+	char *cookie = NIL;
+	ENVELOPE *env;
+	BODY *bod=NULL, *topbod=NULL;
+	PART *mypart=NULL, *part;
+	PARAMETER *param, *disp_param = NULL, *custom_headers_param = NULL, *tmp_param = NULL;
+	char *tmp=NULL, *mystring=NULL, *t=NULL, *tempstring=NULL, *str_copy = NULL;
+	int toppart = 0;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "aa", &envelope, &body) == FAILURE) {
+		return;
+	}
+
+#define PHP_RFC822_PARSE_ADRLIST(target, value) \
+	str_copy = estrndup(Z_STRVAL_PP(value), Z_STRLEN_PP(value)); \
+	rfc822_parse_adrlist(target, str_copy, "NO HOST"); \
+	efree(str_copy);
+
+	env = mail_newenvelope();
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "remail", sizeof("remail"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		env->remail = cpystr(Z_STRVAL_PP(pvalue));
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "return_path", sizeof("return_path"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->return_path, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "date", sizeof("date"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		env->date = cpystr(Z_STRVAL_PP(pvalue));
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "from", sizeof("from"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->from, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "reply_to", sizeof("reply_to"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->reply_to, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "in_reply_to", sizeof("in_reply_to"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		env->in_reply_to = cpystr(Z_STRVAL_PP(pvalue));
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "subject", sizeof("subject"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		env->subject = cpystr(Z_STRVAL_PP(pvalue));
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "to", sizeof("to"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->to, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "cc", sizeof("cc"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->cc, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "bcc", sizeof("bcc"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		PHP_RFC822_PARSE_ADRLIST(&env->bcc, pvalue);
+	}
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "message_id", sizeof("message_id"), (void **) &pvalue)== SUCCESS) {
+		convert_to_string_ex(pvalue);
+		env->message_id=cpystr(Z_STRVAL_PP(pvalue));
+	}
+
+	if (zend_hash_find(Z_ARRVAL_P(envelope), "custom_headers", sizeof("custom_headers"), (void **) &pvalue)== SUCCESS) {
+		if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
+			custom_headers_param = tmp_param = NULL;
+			while (zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) &env_data) == SUCCESS) {
+				custom_headers_param = mail_newbody_parameter();
+				convert_to_string_ex(env_data);
+				custom_headers_param->value = (char *) fs_get(Z_STRLEN_PP(env_data) + 1);
+				custom_headers_param->attribute = NULL;
+				memcpy(custom_headers_param->value, Z_STRVAL_PP(env_data), Z_STRLEN_PP(env_data) + 1);
+				zend_hash_move_forward(Z_ARRVAL_PP(pvalue));
+				custom_headers_param->next = tmp_param;
+				tmp_param = custom_headers_param;
+			}
+		}
+	}
+
+	zend_hash_internal_pointer_reset(Z_ARRVAL_P(body));
+	if (zend_hash_get_current_data(Z_ARRVAL_P(body), (void **) &data) != SUCCESS || Z_TYPE_PP(data) != IS_ARRAY) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter must be a non-empty array");
+		RETURN_FALSE;
+	}
+
+	if (Z_TYPE_PP(data) == IS_ARRAY) {
+		bod = mail_newbody();
+		topbod = bod;
+
+		if (zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &pvalue)== SUCCESS) {
+			convert_to_long_ex(pvalue);
+			bod->type = (short) Z_LVAL_PP(pvalue);
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "encoding", sizeof("encoding"), (void **) &pvalue)== SUCCESS) {
+			convert_to_long_ex(pvalue);
+			bod->encoding = (short) Z_LVAL_PP(pvalue);
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "charset", sizeof("charset"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			tmp_param = mail_newbody_parameter();
+			tmp_param->value = cpystr(Z_STRVAL_PP(pvalue));
+			tmp_param->attribute = cpystr("CHARSET");
+			tmp_param->next = bod->parameter;
+			bod->parameter = tmp_param;
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "type.parameters", sizeof("type.parameters"), (void **) &pvalue)== SUCCESS) {
+			if(Z_TYPE_PP(pvalue) == IS_ARRAY) {
+				disp_param = tmp_param = NULL;
+				while (zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) &disp_data) == SUCCESS) {
+					disp_param = mail_newbody_parameter();
+					zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), &key, &ind, 0);
+					disp_param->attribute = cpystr(key);
+					convert_to_string_ex(disp_data);
+					disp_param->value = (char *) fs_get(Z_STRLEN_PP(disp_data) + 1);
+					memcpy(disp_param->value, Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
+					zend_hash_move_forward(Z_ARRVAL_PP(pvalue));
+					disp_param->next = tmp_param;
+					tmp_param = disp_param;
+				}
+			bod->parameter = disp_param;
+			}
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "subtype", sizeof("subtype"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->subtype = cpystr(Z_STRVAL_PP(pvalue));
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "id", sizeof("id"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->id = cpystr(Z_STRVAL_PP(pvalue));
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "description", sizeof("description"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->description = cpystr(Z_STRVAL_PP(pvalue));
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "disposition.type", sizeof("disposition.type"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->disposition.type = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+			memcpy(bod->disposition.type, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "disposition", sizeof("disposition"), (void **) &pvalue)== SUCCESS) {
+			if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
+				disp_param = tmp_param = NULL;
+				while (zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) &disp_data) == SUCCESS) {
+					disp_param = mail_newbody_parameter();
+					zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), &key, &ind, 0);
+					disp_param->attribute = cpystr(key);
+					convert_to_string_ex(disp_data);
+					disp_param->value = (char *) fs_get(Z_STRLEN_PP(disp_data) + 1);
+					memcpy(disp_param->value, Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
+					zend_hash_move_forward(Z_ARRVAL_PP(pvalue));
+					disp_param->next = tmp_param;
+					tmp_param = disp_param;
+				}
+				bod->disposition.parameter = disp_param;
+			}
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "contents.data", sizeof("contents.data"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+			memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
+			bod->contents.text.size = Z_STRLEN_PP(pvalue);
+		} else {
+			bod->contents.text.data = (char *) fs_get(1);
+			memcpy(bod->contents.text.data, "", 1);
+			bod->contents.text.size = 0;
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) {
+			convert_to_long_ex(pvalue);
+			bod->size.lines = Z_LVAL_PP(pvalue);
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "bytes", sizeof("bytes"), (void **) &pvalue)== SUCCESS) {
+			convert_to_long_ex(pvalue);
+			bod->size.bytes = Z_LVAL_PP(pvalue);
+		}
+		if (zend_hash_find(Z_ARRVAL_PP(data), "md5", sizeof("md5"), (void **) &pvalue)== SUCCESS) {
+			convert_to_string_ex(pvalue);
+			bod->md5 = cpystr(Z_STRVAL_PP(pvalue));
+		}
+	}
+
+	zend_hash_move_forward(Z_ARRVAL_P(body));
+
+	while (zend_hash_get_current_data(Z_ARRVAL_P(body), (void **) &data) == SUCCESS) {
+		if (Z_TYPE_PP(data) == IS_ARRAY) {
+			short type = -1;
+			if (zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &pvalue)== SUCCESS) {
+				convert_to_long_ex(pvalue);
+				type = (short) Z_LVAL_PP(pvalue);
+			}
+
+			if (!toppart) {
+				bod->nested.part = mail_newbody_part();
+				mypart = bod->nested.part;
+				toppart = 1;
+			} else {
+				mypart->next = mail_newbody_part();
+				mypart = mypart->next;
+			}
+
+			bod = &mypart->body;
+
+			if (type != TYPEMULTIPART) {
+				bod->type = type;
+			}
+
+			if (zend_hash_find(Z_ARRVAL_PP(data), "encoding", sizeof("encoding"), (void **) &pvalue)== SUCCESS) {
+				convert_to_long_ex(pvalue);
+				bod->encoding = (short) Z_LVAL_PP(pvalue);
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "charset", sizeof("charset"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				tmp_param = mail_newbody_parameter();
+				tmp_param->value = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+				memcpy(tmp_param->value, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1);
+				tmp_param->attribute = cpystr("CHARSET");
+				tmp_param->next = bod->parameter;
+				bod->parameter = tmp_param;
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "type.parameters", sizeof("type.parameters"), (void **) &pvalue)== SUCCESS) {
+				if(Z_TYPE_PP(pvalue) == IS_ARRAY) {
+					disp_param = tmp_param = NULL;
+					while (zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) &disp_data) == SUCCESS) {
+						disp_param = mail_newbody_parameter();
+						zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), &key, &ind, 0);
+						disp_param->attribute = cpystr(key);
+						convert_to_string_ex(disp_data);
+						disp_param->value = (char *) fs_get(Z_STRLEN_PP(disp_data) + 1);
+						memcpy(disp_param->value, Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
+						zend_hash_move_forward(Z_ARRVAL_PP(pvalue));
+						disp_param->next = tmp_param;
+						tmp_param = disp_param;
+					}
+					bod->parameter = disp_param;
+				}
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "subtype", sizeof("subtype"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->subtype = cpystr(Z_STRVAL_PP(pvalue));
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "id", sizeof("id"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->id = cpystr(Z_STRVAL_PP(pvalue));
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "description", sizeof("description"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->description = cpystr(Z_STRVAL_PP(pvalue));
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "disposition.type", sizeof("disposition.type"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->disposition.type = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+				memcpy(bod->disposition.type, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "disposition", sizeof("disposition"), (void **) &pvalue)== SUCCESS) {
+				if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
+					disp_param = tmp_param = NULL;
+					while (zend_hash_get_current_data(Z_ARRVAL_PP(pvalue), (void **) &disp_data) == SUCCESS) {
+						disp_param = mail_newbody_parameter();
+						zend_hash_get_current_key(Z_ARRVAL_PP(pvalue), &key, &ind, 0);
+						disp_param->attribute = cpystr(key);
+						convert_to_string_ex(disp_data);
+						disp_param->value = (char *) fs_get(Z_STRLEN_PP(disp_data) + 1);
+						memcpy(disp_param->value, Z_STRVAL_PP(disp_data), Z_STRLEN_PP(disp_data) + 1);
+						zend_hash_move_forward(Z_ARRVAL_PP(pvalue));
+						disp_param->next = tmp_param;
+						tmp_param = disp_param;
+					}
+					bod->disposition.parameter = disp_param;
+				}
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "contents.data", sizeof("contents.data"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->contents.text.data = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+				memcpy(bod->contents.text.data, Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue) + 1);
+				bod->contents.text.size = Z_STRLEN_PP(pvalue);
+			} else {
+				bod->contents.text.data = (char *) fs_get(1);
+				memcpy(bod->contents.text.data, "", 1);
+				bod->contents.text.size = 0;
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "lines", sizeof("lines"), (void **) &pvalue)== SUCCESS) {
+				convert_to_long_ex(pvalue);
+				bod->size.lines = Z_LVAL_PP(pvalue);
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "bytes", sizeof("bytes"), (void **) &pvalue)== SUCCESS) {
+				convert_to_long_ex(pvalue);
+				bod->size.bytes = Z_LVAL_PP(pvalue);
+			}
+			if (zend_hash_find(Z_ARRVAL_PP(data), "md5", sizeof("md5"), (void **) &pvalue)== SUCCESS) {
+				convert_to_string_ex(pvalue);
+				bod->md5 = cpystr(Z_STRVAL_PP(pvalue));
+			}
+		}
+		zend_hash_move_forward(Z_ARRVAL_P(body));
+	}
+
+	if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot generate multipart e-mail without components.");
+		RETVAL_FALSE;
+		goto done;
+	}
+
+	rfc822_encode_body_7bit(env, topbod);
+
+	tmp = emalloc(SENDBUFLEN + 1);
+
+	rfc822_header(tmp, env, topbod);
+
+	/* add custom envelope headers */
+	if (custom_headers_param) {
+		int l = strlen(tmp) - 2, l2;
+		PARAMETER *tp = custom_headers_param;
+
+		/* remove last CRLF from tmp */
+		tmp[l] = '\0';
+		tempstring = emalloc(l);
+		memcpy(tempstring, tmp, l);
+
+		do {
+			l2 = strlen(custom_headers_param->value);
+			tempstring = erealloc(tempstring, l + l2 + CRLF_LEN + 1);
+			memcpy(tempstring + l, custom_headers_param->value, l2);
+			memcpy(tempstring + l + l2, CRLF, CRLF_LEN);
+			l += l2 + CRLF_LEN;
+		} while ((custom_headers_param = custom_headers_param->next));
+
+		mail_free_body_parameter(&tp);
+
+		mystring = emalloc(l + CRLF_LEN + 1);
+		memcpy(mystring, tempstring, l);
+		memcpy(mystring + l , CRLF, CRLF_LEN);
+		mystring[l + CRLF_LEN] = '\0';
+
+		efree(tempstring);
+	} else {
+		mystring = estrdup(tmp);
+	}
+
+	bod = topbod;
+
+	if (bod && bod->type == TYPEMULTIPART) {
+
+		/* first body part */
+			part = bod->nested.part;
+
+		/* find cookie */
+			for (param = bod->parameter; param && !cookie; param = param->next) {
+				if (!strcmp (param->attribute, "BOUNDARY")) {
+					cookie = param->value;
+				}
+			}
+
+		/* yucky default */
+			if (!cookie) {
+				cookie = "-";
+			} else if (strlen(cookie) > (SENDBUFLEN - 2 - 2 - 2)) { /* validate cookie length -- + CRLF * 2 */
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "The boundary should be no longer than 4kb");
+				RETVAL_FALSE;
+				goto done;
+			}
+
+		/* for each part */
+			do {
+				t = tmp;
+
+			/* append mini-header */
+				*t = '\0';
+				rfc822_write_body_header(&t, &part->body);
+
+			/* output cookie, mini-header, and contents */
+				spprintf(&tempstring, 0, "%s--%s%s%s%s", mystring, cookie, CRLF, tmp, CRLF);
+				efree(mystring);
+				mystring=tempstring;
+
+				bod=&part->body;
+
+				spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data, CRLF);
+				efree(mystring);
+				mystring=tempstring;
+			} while ((part = part->next)); /* until done */
+
+			/* output trailing cookie */
+			spprintf(&tempstring, 0, "%s--%s--%s", mystring, cookie, CRLF);
+			efree(mystring);
+			mystring=tempstring;
+	} else if (bod) {
+		spprintf(&tempstring, 0, "%s%s%s", mystring, bod->contents.text.data, CRLF);
+		efree(mystring);
+		mystring=tempstring;
+	} else {
+		efree(mystring);
+		RETVAL_FALSE;
+		goto done;
+	}
+
+	RETVAL_STRING(tempstring, 0);
+done:
+	if (tmp) {
+		efree(tmp);
+	}
+	mail_free_body(&topbod);
+	mail_free_envelope(&env);
+}
+/* }}} */
+
+/* {{{ _php_imap_mail
+ */
+int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath TSRMLS_DC)
+{
+#ifdef PHP_WIN32
+	int tsm_err;
+#else
+	FILE *sendmail;
+	int ret;
+#endif
+
+#ifdef PHP_WIN32
+	char *tempMailTo;
+	char *tsm_errmsg = NULL;
+	ADDRESS *addr;
+	char *bufferTo = NULL, *bufferCc = NULL, *bufferBcc = NULL, *bufferHeader = NULL;
+	int offset, bufferLen = 0;
+	size_t bt_len;
+
+	if (headers) {
+		bufferLen += strlen(headers);
+	}
+	if (to) {
+		bufferLen += strlen(to) + 6;
+	}
+	if (cc) {
+		bufferLen += strlen(cc) + 6;
+	}
+
+#define PHP_IMAP_CLEAN	if (bufferTo) efree(bufferTo); if (bufferCc) efree(bufferCc); if (bufferBcc) efree(bufferBcc); if (bufferHeader) efree(bufferHeader);
+#define PHP_IMAP_BAD_DEST PHP_IMAP_CLEAN; efree(tempMailTo); return (BAD_MSG_DESTINATION);
+
+	bufferHeader = (char *)emalloc(bufferLen + 1);
+	memset(bufferHeader, 0, bufferLen);
+	if (to && *to) {
+		strlcat(bufferHeader, "To: ", bufferLen + 1);
+		strlcat(bufferHeader, to, bufferLen + 1);
+		strlcat(bufferHeader, "\r\n", bufferLen + 1);
+		tempMailTo = estrdup(to);
+		bt_len = strlen(to);
+		bufferTo = (char *)safe_emalloc(bt_len, 1, 1);
+		bt_len++;
+		offset = 0;
+		addr = NULL;
+		rfc822_parse_adrlist(&addr, tempMailTo, NULL);
+		while (addr) {
+			if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
+				PHP_IMAP_BAD_DEST;
+			} else {
+				bufferTo = safe_erealloc(bufferTo, bt_len, 1, strlen(addr->mailbox));
+				bt_len += strlen(addr->mailbox);
+				bufferTo = safe_erealloc(bufferTo, bt_len, 1, strlen(addr->host));
+				bt_len += strlen(addr->host);
+				offset += slprintf(bufferTo + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
+			}
+			addr = addr->next;
+		}
+		efree(tempMailTo);
+		if (offset>0) {
+			bufferTo[offset-1] = 0;
+		}
+	}
+
+	if (cc && *cc) {
+		strlcat(bufferHeader, "Cc: ", bufferLen + 1);
+		strlcat(bufferHeader, cc, bufferLen + 1);
+		strlcat(bufferHeader, "\r\n", bufferLen + 1);
+		tempMailTo = estrdup(cc);
+		bt_len = strlen(cc);
+		bufferCc = (char *)safe_emalloc(bt_len, 1, 1);
+		bt_len++;
+		offset = 0;
+		addr = NULL;
+		rfc822_parse_adrlist(&addr, tempMailTo, NULL);
+		while (addr) {
+			if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
+				PHP_IMAP_BAD_DEST;
+			} else {
+				bufferCc = safe_erealloc(bufferCc, bt_len, 1, strlen(addr->mailbox));
+				bt_len += strlen(addr->mailbox);
+				bufferCc = safe_erealloc(bufferCc, bt_len, 1, strlen(addr->host));
+				bt_len += strlen(addr->host);
+				offset += slprintf(bufferCc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
+			}
+			addr = addr->next;
+		}
+		efree(tempMailTo);
+		if (offset>0) {
+			bufferCc[offset-1] = 0;
+		}
+	}
+
+	if (bcc && *bcc) {
+		tempMailTo = estrdup(bcc);
+		bt_len = strlen(bcc);
+		bufferBcc = (char *)safe_emalloc(bt_len, 1, 1);
+		bt_len++;
+		offset = 0;
+		addr = NULL;
+		rfc822_parse_adrlist(&addr, tempMailTo, NULL);
+		while (addr) {
+			if (addr->host == NULL || strcmp(addr->host, ERRHOST) == 0) {
+				PHP_IMAP_BAD_DEST;
+			} else {
+				bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, strlen(addr->mailbox));
+				bt_len += strlen(addr->mailbox);
+				bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, strlen(addr->host));
+				bt_len += strlen(addr->host);
+				offset += slprintf(bufferBcc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
+			}
+			addr = addr->next;
+		}
+		efree(tempMailTo);
+		if (offset>0) {
+			bufferBcc[offset-1] = 0;
+		}
+	}
+
+	if (headers && *headers) {
+		strlcat(bufferHeader, headers, bufferLen + 1);
+	}
+
+	if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, bufferHeader, subject, bufferTo, message, bufferCc, bufferBcc, rpath TSRMLS_CC) != SUCCESS) {
+		if (tsm_errmsg) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", tsm_errmsg);
+			efree(tsm_errmsg);
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", GetSMErrorText(tsm_err));
+		}
+		PHP_IMAP_CLEAN;
+		return 0;
+	}
+	PHP_IMAP_CLEAN;
+#else
+	if (!INI_STR("sendmail_path")) {
+		return 0;
+	}
+	sendmail = popen(INI_STR("sendmail_path"), "w");
+	if (sendmail) {
+		if (rpath && rpath[0]) fprintf(sendmail, "From: %s\n", rpath);
+		fprintf(sendmail, "To: %s\n", to);
+		if (cc && cc[0]) fprintf(sendmail, "Cc: %s\n", cc);
+		if (bcc && bcc[0]) fprintf(sendmail, "Bcc: %s\n", bcc);
+		fprintf(sendmail, "Subject: %s\n", subject);
+		if (headers != NULL) {
+			fprintf(sendmail, "%s\n", headers);
+		}
+		fprintf(sendmail, "\n%s\n", message);
+		ret = pclose(sendmail);
+		if (ret == -1) {
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute mail delivery program");
+		return 0;
+	}
+#endif
+	return 1;
+}
+/* }}} */
+
+/* {{{ proto bool imap_mail(string to, string subject, string message [, string additional_headers [, string cc [, string bcc [, string rpath]]]])
+   Send an email message */
+PHP_FUNCTION(imap_mail)
+{
+	char *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL;
+	int to_len, message_len, headers_len, subject_len, cc_len, bcc_len, rpath_len, argc = ZEND_NUM_ARGS();
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "sss|ssss", &to, &to_len, &subject, &subject_len, &message, &message_len,
+		&headers, &headers_len, &cc, &cc_len, &bcc, &bcc_len, &rpath, &rpath_len) == FAILURE) {
+		return;
+	}
+
+	/* To: */
+	if (!to_len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No to field in mail command");
+		RETURN_FALSE;
+	}
+
+	/* Subject: */
+	if (!subject_len) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No subject field in mail command");
+		RETURN_FALSE;
+	}
+
+	/* message body */
+	if (!message_len) {
+		/* this is not really an error, so it is allowed. */
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message string in mail command");
+		message = NULL;
+	}
+
+	if (_php_imap_mail(to, subject, message, headers, cc, bcc, rpath TSRMLS_CC)) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+/* {{{ proto array imap_search(resource stream_id, string criteria [, int options [, string charset]])
+   Return a list of messages matching the given criteria */
+PHP_FUNCTION(imap_search)
+{
+	zval *streamind;
+	char *criteria, *charset = NULL;
+	int criteria_len, charset_len = 0;
+	long flags = SE_FREE;
+	pils *imap_le_struct;
+	char *search_criteria;
+	MESSAGELIST *cur;
+	int argc = ZEND_NUM_ARGS();
+	SEARCHPGM *pgm = NIL;
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "rs|ls", &streamind, &criteria, &criteria_len, &flags, &charset, &charset_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	search_criteria = estrndup(criteria, criteria_len);
+
+	IMAPG(imap_messages) = IMAPG(imap_messages_tail) = NIL;
+	pgm = mail_criteria(search_criteria);
+
+	mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? charset : NIL), pgm, flags);
+
+	if (pgm && !(flags & SE_FREE)) {
+		mail_free_searchpgm(&pgm);
+	}
+
+	if (IMAPG(imap_messages) == NIL) {
+		efree(search_criteria);
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+
+	cur = IMAPG(imap_messages);
+	while (cur != NIL) {
+		add_next_index_long(return_value, cur->msgid);
+		cur = cur->next;
+	}
+	mail_free_messagelist(&IMAPG(imap_messages), &IMAPG(imap_messages_tail));
+	efree(search_criteria);
+}
+/* }}} */
+
+/* {{{ proto array imap_alerts(void)
+   Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. */
+/* Author: CJH */
+PHP_FUNCTION(imap_alerts)
+{
+	STRINGLIST *cur=NIL;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	if (IMAPG(imap_alertstack) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+
+	cur = IMAPG(imap_alertstack);
+	while (cur != NIL) {
+		add_next_index_string(return_value, cur->LTEXT, 1);
+		cur = cur->next;
+	}
+	mail_free_stringlist(&IMAPG(imap_alertstack));
+	IMAPG(imap_alertstack) = NIL;
+}
+/* }}} */
+
+/* {{{ proto array imap_errors(void)
+   Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called. */
+/* Author: CJH */
+PHP_FUNCTION(imap_errors)
+{
+	ERRORLIST *cur=NIL;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	if (IMAPG(imap_errorstack) == NIL) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+
+	cur = IMAPG(imap_errorstack);
+	while (cur != NIL) {
+		add_next_index_string(return_value, cur->LTEXT, 1);
+		cur = cur->next;
+	}
+	mail_free_errorlist(&IMAPG(imap_errorstack));
+	IMAPG(imap_errorstack) = NIL;
+}
+/* }}} */
+
+/* {{{ proto string imap_last_error(void)
+   Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call. */
+/* Author: CJH */
+PHP_FUNCTION(imap_last_error)
+{
+	ERRORLIST *cur=NIL;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	if (IMAPG(imap_errorstack) == NIL) {
+		RETURN_FALSE;
+	}
+
+	cur = IMAPG(imap_errorstack);
+	while (cur != NIL) {
+		if (cur->next == NIL) {
+			RETURN_STRING(cur->LTEXT, 1);
+		}
+		cur = cur->next;
+	}
+}
+/* }}} */
+
+/* {{{ proto array imap_mime_header_decode(string str)
+   Decode mime header element in accordance with RFC 2047 and return array of objects containing 'charset' encoding and decoded 'text' */
+PHP_FUNCTION(imap_mime_header_decode)
+{
+	/* Author: Ted Parnefors <ted@mtv.se> */
+	zval *myobject;
+	char *str, *string, *charset, encoding, *text, *decode;
+	int str_len;
+	long charset_token, encoding_token, end_token, end, offset=0, i;
+	unsigned long newlength;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+		return;
+	}
+
+	array_init(return_value);
+
+	string = str;
+	end = str_len;
+
+	charset = (char *) safe_emalloc((end + 1), 2, 0);
+	text = &charset[end + 1];
+	while (offset < end) {	/* Reached end of the string? */
+		if ((charset_token = (long)php_memnstr(&string[offset], "=?", 2, string + end))) {	/* Is there anything encoded in the string? */
+			charset_token -= (long)string;
+			if (offset != charset_token) {	/* Is there anything before the encoded data? */
+				/* Retrieve unencoded data that is found before encoded data */
+				memcpy(text, &string[offset], charset_token-offset);
+				text[charset_token - offset] = 0x00;
+				MAKE_STD_ZVAL(myobject);
+				object_init(myobject);
+				add_property_string(myobject, "charset", "default", 1);
+				add_property_string(myobject, "text", text, 1);
+				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), (void *)&myobject, sizeof(zval *), NULL);
+			}
+			if ((encoding_token = (long)php_memnstr(&string[charset_token+2], "?", 1, string+end))) {		/* Find token for encoding */
+				encoding_token -= (long)string;
+				if ((end_token = (long)php_memnstr(&string[encoding_token+3], "?=", 2, string+end))) {	/* Find token for end of encoded data */
+					end_token -= (long)string;
+					memcpy(charset, &string[charset_token + 2], encoding_token - (charset_token + 2));	/* Extract charset encoding */
+					charset[encoding_token-(charset_token + 2)] = 0x00;
+					encoding=string[encoding_token + 1];	/* Extract encoding from string */
+					memcpy(text, &string[encoding_token + 3], end_token - (encoding_token + 3));	/* Extract text */
+					text[end_token - (encoding_token + 3)] = 0x00;
+					decode = text;
+					if (encoding == 'q' || encoding == 'Q') {	/* Decode 'q' encoded data */
+						for(i=0; text[i] != 0x00; i++) if (text[i] == '_') text[i] = ' ';	/* Replace all *_' with space. */
+						decode = (char *)rfc822_qprint((unsigned char *) text, strlen(text), &newlength);
+					} else if (encoding == 'b' || encoding == 'B') {
+						decode = (char *)rfc822_base64((unsigned char *) text, strlen(text), &newlength); /* Decode 'B' encoded data */
+					}
+					if (decode == NULL) {
+						efree(charset);
+						zval_dtor(return_value);
+						RETURN_FALSE;
+					}
+					MAKE_STD_ZVAL(myobject);
+					object_init(myobject);
+					add_property_string(myobject, "charset", charset, 1);
+					add_property_string(myobject, "text", decode, 1);
+					zend_hash_next_index_insert(Z_ARRVAL_P(return_value), (void *)&myobject, sizeof(zval *), NULL);
+
+					/* only free decode if it was allocated by rfc822_qprint or rfc822_base64 */
+					if (decode != text) {
+						fs_give((void**)&decode);
+					}
+
+					offset = end_token+2;
+					for (i = 0; (string[offset + i] == ' ') || (string[offset + i] == 0x0a) || (string[offset + i] == 0x0d) || (string[offset + i] == '\t'); i++);
+					if ((string[offset + i] == '=') && (string[offset + i + 1] == '?') && (offset + i < end)) {
+						offset += i;
+					}
+					continue;	/*/ Iterate the loop again please. */
+				}
+			}
+		} else {
+			/* Just some tweaking to optimize the code, and get the end statements work in a general manner.
+			 * If we end up here we didn't find a position for "charset_token",
+			 * so we need to set it to the start of the yet unextracted data.
+			 */
+			charset_token = offset;
+		}
+		/* Return the rest of the data as unencoded, as it was either unencoded or was missing separators
+		   which rendered the remainder of the string impossible for us to decode. */
+		memcpy(text, &string[charset_token], end - charset_token);	/* Extract unencoded text from string */
+		text[end - charset_token] = 0x00;
+		MAKE_STD_ZVAL(myobject);
+		object_init(myobject);
+		add_property_string(myobject, "charset", "default", 1);
+		add_property_string(myobject, "text", text, 1);
+		zend_hash_next_index_insert(Z_ARRVAL_P(return_value), (void *)&myobject, sizeof(zval *), NULL);
+
+		offset = end;	/* We have reached the end of the string. */
+	}
+	efree(charset);
+}
+/* }}} */
+
+/* Support Functions */
+
+#ifdef HAVE_RFC822_OUTPUT_ADDRESS_LIST
+/* {{{ _php_rfc822_soutr
+ */
+static long _php_rfc822_soutr (void *stream, char *string)
+{
+	smart_str *ret = (smart_str*)stream;
+	int len = strlen(string);
+
+	smart_str_appendl(ret, string, len);
+	return LONGT;
+}
+/* }}} */
+
+/* {{{ _php_rfc822_write_address
+ */
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC)
+{
+	char address[MAILTMPLEN];
+	smart_str ret = {0};
+	RFC822BUFFER buf;
+
+	buf.beg = address;
+	buf.cur = buf.beg;
+	buf.end = buf.beg + sizeof(address) - 1;
+	buf.s = &ret;
+	buf.f = _php_rfc822_soutr;
+	rfc822_output_address_list(&buf, addresslist, 0, NULL);
+	rfc822_output_flush(&buf);
+	smart_str_0(&ret);
+	return ret.c;
+}
+/* }}} */
+
+#else
+
+/* {{{ _php_rfc822_len
+ * Calculate string length based on imap's rfc822_cat function.
+ */
+static int _php_rfc822_len(char *str)
+{
+	int len;
+	char *p;
+
+	if (!str || !*str) {
+		return 0;
+	}
+
+	/* strings with special characters will need to be quoted, as a safety measure we
+	 * add 2 bytes for the quotes just in case.
+	 */
+	len = strlen(str) + 2;
+	p = str;
+	/* rfc822_cat() will escape all " and \ characters, therefor we need to increase
+	 * our buffer length to account for these characters.
+	 */
+	while ((p = strpbrk(p, "\\\""))) {
+		p++;
+		len++;
+	}
+
+	return len;
+}
+/* }}} */
+
+/* {{{ _php_imap_get_address_size
+ */
+static int _php_imap_address_size (ADDRESS *addresslist)
+{
+	ADDRESS *tmp;
+	int ret=0, num_ent=0;
+
+	tmp = addresslist;
+
+	if (tmp) do {
+		ret += _php_rfc822_len(tmp->personal);
+		ret += _php_rfc822_len(tmp->adl);
+		ret += _php_rfc822_len(tmp->mailbox);
+		ret += _php_rfc822_len(tmp->host);
+		num_ent++;
+	} while ((tmp = tmp->next));
+
+	/*
+	 * rfc822_write_address_full() needs some extra space for '<>,', etc.
+	 * for this perpouse we allocate additional PHP_IMAP_ADDRESS_SIZE_BUF bytes
+	 * by default this buffer is 10 bytes long
+	*/
+	ret += (ret) ? num_ent*PHP_IMAP_ADDRESS_SIZE_BUF : 0;
+
+	return ret;
+}
+
+/* }}} */
+
+/* {{{ _php_rfc822_write_address
+ */
+static char* _php_rfc822_write_address(ADDRESS *addresslist TSRMLS_DC)
+{
+	char address[SENDBUFLEN];
+
+	if (_php_imap_address_size(addresslist) >= SENDBUFLEN) {
+		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Address buffer overflow");
+		return NULL;
+	}
+	address[0] = 0;
+	rfc822_write_address(address, addresslist);
+	return estrdup(address);
+}
+/* }}} */
+#endif
+/* {{{ _php_imap_parse_address
+ */
+static char* _php_imap_parse_address (ADDRESS *addresslist, zval *paddress TSRMLS_DC)
+{
+	char *fulladdress;
+	ADDRESS *addresstmp;
+	zval *tmpvals;
+
+	addresstmp = addresslist;
+
+	fulladdress = _php_rfc822_write_address(addresstmp TSRMLS_CC);
+
+	addresstmp = addresslist;
+	do {
+		MAKE_STD_ZVAL(tmpvals);
+		object_init(tmpvals);
+		if (addresstmp->personal) add_property_string(tmpvals, "personal", addresstmp->personal, 1);
+		if (addresstmp->adl) add_property_string(tmpvals, "adl", addresstmp->adl, 1);
+		if (addresstmp->mailbox) add_property_string(tmpvals, "mailbox", addresstmp->mailbox, 1);
+		if (addresstmp->host) add_property_string(tmpvals, "host", addresstmp->host, 1);
+		add_next_index_object(paddress, tmpvals TSRMLS_CC);
+	} while ((addresstmp = addresstmp->next));
+	return fulladdress;
+}
+/* }}} */
+
+/* {{{ _php_make_header_object
+ */
+static void _php_make_header_object(zval *myzvalue, ENVELOPE *en TSRMLS_DC)
+{
+	zval *paddress;
+	char *fulladdress=NULL;
+
+	object_init(myzvalue);
+
+	if (en->remail) add_property_string(myzvalue, "remail", en->remail, 1);
+	if (en->date) add_property_string(myzvalue, "date", en->date, 1);
+	if (en->date) add_property_string(myzvalue, "Date", en->date, 1);
+	if (en->subject) add_property_string(myzvalue, "subject", en->subject, 1);
+	if (en->subject) add_property_string(myzvalue, "Subject", en->subject, 1);
+	if (en->in_reply_to) add_property_string(myzvalue, "in_reply_to", en->in_reply_to, 1);
+	if (en->message_id) add_property_string(myzvalue, "message_id", en->message_id, 1);
+	if (en->newsgroups) add_property_string(myzvalue, "newsgroups", en->newsgroups, 1);
+	if (en->followup_to) add_property_string(myzvalue, "followup_to", en->followup_to, 1);
+	if (en->references) add_property_string(myzvalue, "references", en->references, 1);
+
+	if (en->to) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->to, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "toaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "to", paddress TSRMLS_CC);
+	}
+
+	if (en->from) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->from, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "fromaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "from", paddress TSRMLS_CC);
+	}
+
+	if (en->cc) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->cc, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "ccaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "cc", paddress TSRMLS_CC);
+	}
+
+	if (en->bcc) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->bcc, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "bccaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "bcc", paddress TSRMLS_CC);
+	}
+
+	if (en->reply_to) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->reply_to, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "reply_toaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "reply_to", paddress TSRMLS_CC);
+	}
+
+	if (en->sender) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->sender, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "senderaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "sender", paddress TSRMLS_CC);
+	}
+
+	if (en->return_path) {
+		MAKE_STD_ZVAL(paddress);
+		array_init(paddress);
+		fulladdress = _php_imap_parse_address(en->return_path, paddress TSRMLS_CC);
+		if (fulladdress) {
+			add_property_string(myzvalue, "return_pathaddress", fulladdress, 0);
+		}
+		add_assoc_object(myzvalue, "return_path", paddress TSRMLS_CC);
+	}
+}
+/* }}} */
+
+/* {{{ _php_imap_add_body
+ */
+void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
+{
+	zval *parametres, *param, *dparametres, *dparam;
+	PARAMETER *par, *dpar;
+	PART *part;
+
+	if (body->type <= TYPEMAX) {
+		add_property_long(arg, "type", body->type);
+	}
+
+	if (body->encoding <= ENCMAX) {
+		add_property_long(arg, "encoding", body->encoding);
+	}
+
+	if (body->subtype) {
+		add_property_long(arg, "ifsubtype", 1);
+		add_property_string(arg, "subtype", body->subtype, 1);
+	} else {
+		add_property_long(arg, "ifsubtype", 0);
+	}
+
+	if (body->description) {
+		add_property_long(arg, "ifdescription", 1);
+		add_property_string(arg, "description", body->description, 1);
+	} else {
+		add_property_long(arg, "ifdescription", 0);
+	}
+
+	if (body->id) {
+		add_property_long(arg, "ifid", 1);
+		add_property_string(arg, "id", body->id, 1);
+	} else {
+		add_property_long(arg, "ifid", 0);
+	}
+
+	if (body->size.lines) {
+		add_property_long(arg, "lines", body->size.lines);
+	}
+
+	if (body->size.bytes) {
+		add_property_long(arg, "bytes", body->size.bytes);
+	}
+
+#ifdef IMAP41
+	if (body->disposition.type) {
+		add_property_long(arg, "ifdisposition", 1);
+		add_property_string(arg, "disposition", body->disposition.type, 1);
+	} else {
+		add_property_long(arg, "ifdisposition", 0);
+	}
+
+	if (body->disposition.parameter) {
+		dpar = body->disposition.parameter;
+		add_property_long(arg, "ifdparameters", 1);
+		MAKE_STD_ZVAL(dparametres);
+		array_init(dparametres);
+		do {
+			MAKE_STD_ZVAL(dparam);
+			object_init(dparam);
+			add_property_string(dparam, "attribute", dpar->attribute, 1);
+			add_property_string(dparam, "value", dpar->value, 1);
+			add_next_index_object(dparametres, dparam TSRMLS_CC);
+		} while ((dpar = dpar->next));
+		add_assoc_object(arg, "dparameters", dparametres TSRMLS_CC);
+	} else {
+		add_property_long(arg, "ifdparameters", 0);
+	}
+#endif
+
+	if ((par = body->parameter)) {
+		add_property_long(arg, "ifparameters", 1);
+
+		MAKE_STD_ZVAL(parametres);
+		array_init(parametres);
+		do {
+			MAKE_STD_ZVAL(param);
+			object_init(param);
+			if (par->attribute) {
+				add_property_string(param, "attribute", par->attribute, 1);
+			}
+			if (par->value) {
+				add_property_string(param, "value", par->value, 1);
+			}
+
+			add_next_index_object(parametres, param TSRMLS_CC);
+		} while ((par = par->next));
+	} else {
+		MAKE_STD_ZVAL(parametres);
+		object_init(parametres);
+		add_property_long(arg, "ifparameters", 0);
+	}
+	add_assoc_object(arg, "parameters", parametres TSRMLS_CC);
+
+	/* multipart message ? */
+	if (body->type == TYPEMULTIPART) {
+		MAKE_STD_ZVAL(parametres);
+		array_init(parametres);
+		for (part = body->CONTENT_PART; part; part = part->next) {
+			MAKE_STD_ZVAL(param);
+			object_init(param);
+			_php_imap_add_body(param, &part->body TSRMLS_CC);
+			add_next_index_object(parametres, param TSRMLS_CC);
+		}
+		add_assoc_object(arg, "parts", parametres TSRMLS_CC);
+	}
+
+	/* encapsulated message ? */
+	if ((body->type == TYPEMESSAGE) && (!strcasecmp(body->subtype, "rfc822"))) {
+		body = body->CONTENT_MSG_BODY;
+		MAKE_STD_ZVAL(parametres);
+		array_init(parametres);
+		MAKE_STD_ZVAL(param);
+		object_init(param);
+		_php_imap_add_body(param, body TSRMLS_CC);
+		add_next_index_object(parametres, param TSRMLS_CC);
+		add_assoc_object(arg, "parts", parametres TSRMLS_CC);
+	}
+}
+/* }}} */
+
+/* imap_thread, stealing this from header cclient -rjs3 */
+/* {{{ build_thread_tree_helper
+ */
+static void build_thread_tree_helper(THREADNODE *cur, zval *tree, long *numNodes, char *buf)
+{
+	unsigned long thisNode = *numNodes;
+
+	/* define "#.num" */
+	snprintf(buf, 25, "%ld.num", thisNode);
+
+	add_assoc_long(tree, buf, cur->num);
+
+	snprintf(buf, 25, "%ld.next", thisNode);
+	if(cur->next) {
+		(*numNodes)++;
+		add_assoc_long(tree, buf, *numNodes);
+		build_thread_tree_helper(cur->next, tree, numNodes, buf);
+	} else { /* "null pointer" */
+		add_assoc_long(tree, buf, 0);
+	}
+
+	snprintf(buf, 25, "%ld.branch", thisNode);
+	if(cur->branch) {
+		(*numNodes)++;
+		add_assoc_long(tree, buf, *numNodes);
+		build_thread_tree_helper(cur->branch, tree, numNodes, buf);
+	} else { /* "null pointer" */
+		add_assoc_long(tree, buf, 0);
+	}
+}
+/* }}} */
+
+/* {{{ build_thread_tree
+ */
+static int build_thread_tree(THREADNODE *top, zval **tree)
+{
+	long numNodes = 0;
+	char buf[25];
+
+	array_init(*tree);
+
+	build_thread_tree_helper(top, *tree, &numNodes, buf);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ proto array imap_thread(resource stream_id [, int options])
+   Return threaded by REFERENCES tree */
+PHP_FUNCTION(imap_thread)
+{
+	zval *streamind;
+	pils *imap_le_struct;
+	long flags = SE_FREE;
+	char criteria[] = "ALL";
+	THREADNODE *top;
+	int argc = ZEND_NUM_ARGS();
+	SEARCHPGM *pgm = NIL;
+
+	if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &streamind, &flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
+
+	pgm = mail_criteria(criteria);
+	top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm, flags);
+	if (pgm && !(flags & SE_FREE)) {
+		mail_free_searchpgm(&pgm);
+	}
+
+	if(top == NIL) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function returned an empty tree");
+		RETURN_FALSE;
+	}
+
+	/* Populate our return value data structure here. */
+	if(build_thread_tree(top, &return_value) == FAILURE) {
+		mail_free_threadnode(&top);
+		RETURN_FALSE;
+	}
+	mail_free_threadnode(&top);
+}
+/* }}} */
+
+/* {{{ proto mixed imap_timeout(int timeout_type [, int timeout])
+   Set or fetch imap timeout */
+PHP_FUNCTION(imap_timeout)
+{
+	long ttype, timeout=-1;
+	int timeout_type;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &ttype, &timeout) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (timeout == -1) {
+		switch (ttype) {
+			case 1:
+				timeout_type = GET_OPENTIMEOUT;
+				break;
+			case 2:
+				timeout_type = GET_READTIMEOUT;
+				break;
+			case 3:
+				timeout_type = GET_WRITETIMEOUT;
+				break;
+			case 4:
+				timeout_type = GET_CLOSETIMEOUT;
+				break;
+			default:
+				RETURN_FALSE;
+				break;
+		}
+
+		timeout = (long) mail_parameters(NIL, timeout_type, NIL);
+		RETURN_LONG(timeout);
+	} else if (timeout >= 0) {
+		switch (ttype) {
+			case 1:
+				timeout_type = SET_OPENTIMEOUT;
+				break;
+			case 2:
+				timeout_type = SET_READTIMEOUT;
+				break;
+			case 3:
+				timeout_type = SET_WRITETIMEOUT;
+				break;
+			case 4:
+				timeout_type = SET_CLOSETIMEOUT;
+				break;
+			default:
+				RETURN_FALSE;
+				break;
+		}
+
+		timeout = (long) mail_parameters(NIL, timeout_type, (void *) timeout);
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+#define GETS_FETCH_SIZE 8196LU
+static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md) /* {{{ */
+{
+	TSRMLS_FETCH();
+
+	/*	write to the gets stream if it is set,
+		otherwise forward to c-clients gets */
+	if (IMAPG(gets_stream)) {
+		char buf[GETS_FETCH_SIZE];
+
+		while (size) {
+			unsigned long read;
+
+			if (size > GETS_FETCH_SIZE) {
+				read = GETS_FETCH_SIZE;
+				size -=GETS_FETCH_SIZE;
+			} else {
+				read = size;
+				size = 0;
+			}
+
+			if (!f(stream, read, buf)) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from socket");
+				break;
+			} else if (read != php_stream_write(IMAPG(gets_stream), buf, read)) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write to stream");
+				break;
+			}
+		}
+		return NULL;
+	} else {
+		char *buf = pemalloc(size + 1, 1);
+
+		if (f(stream, size, buf)) {
+			buf[size] = '\0';
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from socket");
+			free(buf);
+			buf = NULL;
+		}
+		return buf;
+	}
+}
+/* }}} */
+
+/* {{{ Interfaces to C-client
+ */
+PHP_IMAP_EXPORT void mm_searched(MAILSTREAM *stream, unsigned long number)
+{
+	MESSAGELIST *cur = NIL;
+	TSRMLS_FETCH();
+
+	if (IMAPG(imap_messages) == NIL) {
+		IMAPG(imap_messages) = mail_newmessagelist();
+		IMAPG(imap_messages)->msgid = number;
+		IMAPG(imap_messages)->next = NIL;
+		IMAPG(imap_messages_tail) = IMAPG(imap_messages);
+	} else {
+		cur = IMAPG(imap_messages_tail);
+		cur->next = mail_newmessagelist();
+		cur = cur->next;
+		cur->msgid = number;
+		cur->next = NIL;
+		IMAPG(imap_messages_tail) = cur;
+	}
+}
+
+PHP_IMAP_EXPORT void mm_exists(MAILSTREAM *stream, unsigned long number)
+{
+}
+
+PHP_IMAP_EXPORT void mm_expunged(MAILSTREAM *stream, unsigned long number)
+{
+}
+
+PHP_IMAP_EXPORT void mm_flags(MAILSTREAM *stream, unsigned long number)
+{
+}
+
+/* Author: CJH */
+PHP_IMAP_EXPORT void mm_notify(MAILSTREAM *stream, char *str, long errflg)
+{
+	STRINGLIST *cur = NIL;
+	TSRMLS_FETCH();
+
+	if (strncmp(str, "[ALERT] ", 8) == 0) {
+		if (IMAPG(imap_alertstack) == NIL) {
+			IMAPG(imap_alertstack) = mail_newstringlist();
+			IMAPG(imap_alertstack)->LSIZE = strlen(IMAPG(imap_alertstack)->LTEXT = cpystr(str));
+			IMAPG(imap_alertstack)->next = NIL;
+		} else {
+			cur = IMAPG(imap_alertstack);
+			while (cur->next != NIL) {
+				cur = cur->next;
+			}
+			cur->next = mail_newstringlist ();
+			cur = cur->next;
+			cur->LSIZE = strlen(cur->LTEXT = cpystr(str));
+			cur->next = NIL;
+		}
+	}
+}
+
+PHP_IMAP_EXPORT void mm_list(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long attributes)
+{
+	STRINGLIST *cur=NIL;
+	FOBJECTLIST *ocur=NIL;
+	TSRMLS_FETCH();
+
+	if (IMAPG(folderlist_style) == FLIST_OBJECT) {
+		/* build up a the new array of objects */
+		/* Author: CJH */
+		if (IMAPG(imap_folder_objects) == NIL) {
+			IMAPG(imap_folder_objects) = mail_newfolderobjectlist();
+			IMAPG(imap_folder_objects)->LSIZE=strlen(IMAPG(imap_folder_objects)->LTEXT=cpystr(mailbox));
+			IMAPG(imap_folder_objects)->delimiter = delimiter;
+			IMAPG(imap_folder_objects)->attributes = attributes;
+			IMAPG(imap_folder_objects)->next = NIL;
+			IMAPG(imap_folder_objects_tail) = IMAPG(imap_folder_objects);
+		} else {
+			ocur=IMAPG(imap_folder_objects_tail);
+			ocur->next=mail_newfolderobjectlist();
+			ocur=ocur->next;
+			ocur->LSIZE = strlen(ocur->LTEXT = cpystr(mailbox));
+			ocur->delimiter = delimiter;
+			ocur->attributes = attributes;
+			ocur->next = NIL;
+			IMAPG(imap_folder_objects_tail) = ocur;
+		}
+
+	} else {
+		/* build the old IMAPG(imap_folders) variable to allow old imap_listmailbox() to work */
+		if (!(attributes & LATT_NOSELECT)) {
+			if (IMAPG(imap_folders) == NIL) {
+				IMAPG(imap_folders)=mail_newstringlist();
+				IMAPG(imap_folders)->LSIZE=strlen(IMAPG(imap_folders)->LTEXT=cpystr(mailbox));
+				IMAPG(imap_folders)->next=NIL;
+				IMAPG(imap_folders_tail) = IMAPG(imap_folders);
+			} else {
+				cur=IMAPG(imap_folders_tail);
+				cur->next=mail_newstringlist ();
+				cur=cur->next;
+				cur->LSIZE = strlen (cur->LTEXT = cpystr (mailbox));
+				cur->next = NIL;
+				IMAPG(imap_folders_tail) = cur;
+			}
+		}
+	}
+}
+
+PHP_IMAP_EXPORT void mm_lsub(MAILSTREAM *stream, DTYPE delimiter, char *mailbox, long attributes)
+{
+	STRINGLIST *cur=NIL;
+	FOBJECTLIST *ocur=NIL;
+	TSRMLS_FETCH();
+
+	if (IMAPG(folderlist_style) == FLIST_OBJECT) {
+		/* build the array of objects */
+		/* Author: CJH */
+		if (IMAPG(imap_sfolder_objects) == NIL) {
+			IMAPG(imap_sfolder_objects) = mail_newfolderobjectlist();
+			IMAPG(imap_sfolder_objects)->LSIZE=strlen(IMAPG(imap_sfolder_objects)->LTEXT=cpystr(mailbox));
+			IMAPG(imap_sfolder_objects)->delimiter = delimiter;
+			IMAPG(imap_sfolder_objects)->attributes = attributes;
+			IMAPG(imap_sfolder_objects)->next = NIL;
+			IMAPG(imap_sfolder_objects_tail) = IMAPG(imap_sfolder_objects);
+		} else {
+			ocur=IMAPG(imap_sfolder_objects_tail);
+			ocur->next=mail_newfolderobjectlist();
+			ocur=ocur->next;
+			ocur->LSIZE=strlen(ocur->LTEXT = cpystr(mailbox));
+			ocur->delimiter = delimiter;
+			ocur->attributes = attributes;
+			ocur->next = NIL;
+			IMAPG(imap_sfolder_objects_tail) = ocur;
+		}
+	} else {
+		/* build the old simple array for imap_listsubscribed() */
+		if (IMAPG(imap_sfolders) == NIL) {
+			IMAPG(imap_sfolders)=mail_newstringlist();
+			IMAPG(imap_sfolders)->LSIZE=strlen(IMAPG(imap_sfolders)->LTEXT=cpystr(mailbox));
+			IMAPG(imap_sfolders)->next=NIL;
+			IMAPG(imap_sfolders_tail) = IMAPG(imap_sfolders);
+		} else {
+			cur=IMAPG(imap_sfolders_tail);
+			cur->next=mail_newstringlist ();
+			cur=cur->next;
+			cur->LSIZE = strlen (cur->LTEXT = cpystr (mailbox));
+			cur->next = NIL;
+			IMAPG(imap_sfolders_tail) = cur;
+		}
+	}
+}
+
+PHP_IMAP_EXPORT void mm_status(MAILSTREAM *stream, char *mailbox, MAILSTATUS *status)
+{
+	TSRMLS_FETCH();
+
+	IMAPG(status_flags)=status->flags;
+	if (IMAPG(status_flags) & SA_MESSAGES) {
+		IMAPG(status_messages)=status->messages;
+	}
+	if (IMAPG(status_flags) & SA_RECENT) {
+		IMAPG(status_recent)=status->recent;
+	}
+	if (IMAPG(status_flags) & SA_UNSEEN) {
+		IMAPG(status_unseen)=status->unseen;
+	}
+	if (IMAPG(status_flags) & SA_UIDNEXT) {
+		IMAPG(status_uidnext)=status->uidnext;
+	}
+	if (IMAPG(status_flags) & SA_UIDVALIDITY) {
+		IMAPG(status_uidvalidity)=status->uidvalidity;
+	}
+}
+
+PHP_IMAP_EXPORT void mm_log(char *str, long errflg)
+{
+	ERRORLIST *cur = NIL;
+	TSRMLS_FETCH();
+
+	/* Author: CJH */
+	if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */
+		if (IMAPG(imap_errorstack) == NIL) {
+			IMAPG(imap_errorstack) = mail_newerrorlist();
+			IMAPG(imap_errorstack)->LSIZE = strlen(IMAPG(imap_errorstack)->LTEXT = cpystr(str));
+			IMAPG(imap_errorstack)->errflg = errflg;
+			IMAPG(imap_errorstack)->next = NIL;
+		} else {
+			cur = IMAPG(imap_errorstack);
+			while (cur->next != NIL) {
+				cur = cur->next;
+			}
+			cur->next = mail_newerrorlist();
+			cur = cur->next;
+			cur->LSIZE = strlen(cur->LTEXT = cpystr(str));
+			cur->errflg = errflg;
+			cur->next = NIL;
+		}
+	}
+}
+
+PHP_IMAP_EXPORT void mm_dlog(char *str)
+{
+	/* CJH: this is for debugging; it might be useful to allow setting
+	   the stream to debug mode and capturing this somewhere - syslog?
+	   php debugger? */
+}
+
+PHP_IMAP_EXPORT void mm_login(NETMBX *mb, char *user, char *pwd, long trial)
+{
+	TSRMLS_FETCH();
+
+	if (*mb->user) {
+		strlcpy (user, mb->user, MAILTMPLEN);
+	} else {
+		strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
+	}
+	strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN);
+}
+
+PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)
+{
+}
+
+PHP_IMAP_EXPORT void mm_nocritical(MAILSTREAM *stream)
+{
+}
+
+PHP_IMAP_EXPORT long mm_diskerror(MAILSTREAM *stream, long errcode, long serious)
+{
+	return 1;
+}
+
+PHP_IMAP_EXPORT void mm_fatal(char *str)
+{
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
new file mode 100644
index 0000000..52128a6
--- /dev/null
+++ b/ext/imap/php_imap.h
@@ -0,0 +1,233 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Rex Logan           <veebert@dimensional.com>               |
+   |          Mark Musone         <musone@afterfive.com>                  |
+   |          Brian Wang          <brian@vividnet.com>                    |
+   |          Kaj-Michael Lang    <milang@tal.org>                        |
+   |          Antoni Pamies Olive <toni@readysoft.net>                    |
+   |          Rasmus Lerdorf      <rasmus@php.net>                        |
+   |          Chuck Hagenbuch     <chuck@horde.org>                       |
+   |          Andrew Skalski      <askalski@chekinc.com>                  |
+   |          Hartmut Holzgraefe  <hholzgra@php.net>                      |
+   |          Jani Taskinen       <sniper@iki.fi>                         |
+   |          Daniel R. Kalowsky  <kalowsky@php.net>                      |
+   | PHP 4.0 updates:  Zeev Suraski <zeev@zend.com>                       |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifndef PHP_IMAP_H
+#define PHP_IMAP_H
+
+#if HAVE_IMAP
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+ /* these are used for quota support */
+# include "c-client.h"	/* includes mail.h and rfc822.h */
+# include "imap4r1.h"	/* location of c-client quota functions */
+#else
+# include "mail.h"
+# include "rfc822.h" 
+#endif
+
+extern zend_module_entry imap_module_entry;
+#define imap_module_ptr &imap_module_entry
+
+
+/* Data types */
+
+#ifdef IMAP41
+#define LSIZE text.size
+#define LTEXT text.data
+#define DTYPE int
+#define CONTENT_PART nested.part
+#define CONTENT_MSG_BODY nested.msg->body
+#define IMAPVER "Imap 4R1"
+#else
+#define LSIZE size
+#define LTEXT text
+#define DTYPE char
+#define CONTENT_PART contents.part
+#define CONTENT_MSG_BODY contents.msg.body
+#define IMAPVER "Imap 4"
+#endif
+
+
+/* Determines how mm_list() and mm_lsub() are to return their results. */
+typedef enum {
+	FLIST_ARRAY,
+	FLIST_OBJECT
+} folderlist_style_t;
+
+typedef struct php_imap_le_struct {
+	MAILSTREAM *imap_stream;
+	long flags;
+} pils;
+
+typedef struct php_imap_mailbox_struct {
+	SIZEDTEXT text;
+	DTYPE delimiter;
+	long attributes;
+	struct php_imap_mailbox_struct *next;
+} FOBJECTLIST;
+
+typedef struct php_imap_error_struct {
+	SIZEDTEXT text;
+	long errflg;
+	struct php_imap_error_struct *next;
+} ERRORLIST;
+
+typedef struct _php_imap_message_struct {
+	unsigned long msgid;
+	struct _php_imap_message_struct *next;
+} MESSAGELIST;
+ 
+
+/* Functions */
+
+PHP_MINIT_FUNCTION(imap);
+PHP_RINIT_FUNCTION(imap);
+PHP_RSHUTDOWN_FUNCTION(imap);
+PHP_MINFO_FUNCTION(imap);
+
+PHP_FUNCTION(imap_open);
+PHP_FUNCTION(imap_popen);
+PHP_FUNCTION(imap_reopen);
+PHP_FUNCTION(imap_num_msg);
+PHP_FUNCTION(imap_num_recent);
+PHP_FUNCTION(imap_headers);
+PHP_FUNCTION(imap_headerinfo);
+PHP_FUNCTION(imap_rfc822_parse_headers);
+PHP_FUNCTION(imap_body);
+PHP_FUNCTION(imap_fetchstructure);
+PHP_FUNCTION(imap_fetchbody);
+PHP_FUNCTION(imap_fetchmime);
+PHP_FUNCTION(imap_savebody);
+PHP_FUNCTION(imap_gc);
+PHP_FUNCTION(imap_expunge);
+PHP_FUNCTION(imap_delete);
+PHP_FUNCTION(imap_undelete);
+PHP_FUNCTION(imap_check);
+PHP_FUNCTION(imap_close);
+PHP_FUNCTION(imap_mail_copy);
+PHP_FUNCTION(imap_mail_move);
+PHP_FUNCTION(imap_createmailbox);
+PHP_FUNCTION(imap_renamemailbox);
+PHP_FUNCTION(imap_deletemailbox);
+PHP_FUNCTION(imap_listmailbox);
+PHP_FUNCTION(imap_scanmailbox);
+PHP_FUNCTION(imap_subscribe);
+PHP_FUNCTION(imap_unsubscribe);
+PHP_FUNCTION(imap_append);
+PHP_FUNCTION(imap_ping);
+PHP_FUNCTION(imap_base64);
+PHP_FUNCTION(imap_qprint);
+PHP_FUNCTION(imap_8bit);
+PHP_FUNCTION(imap_binary);
+PHP_FUNCTION(imap_mailboxmsginfo);
+PHP_FUNCTION(imap_rfc822_write_address);
+PHP_FUNCTION(imap_rfc822_parse_adrlist);
+PHP_FUNCTION(imap_setflag_full);
+PHP_FUNCTION(imap_clearflag_full);
+PHP_FUNCTION(imap_sort);
+PHP_FUNCTION(imap_fetchheader);
+PHP_FUNCTION(imap_fetchtext);
+PHP_FUNCTION(imap_uid);
+PHP_FUNCTION(imap_msgno);
+PHP_FUNCTION(imap_list);
+PHP_FUNCTION(imap_list_full);
+PHP_FUNCTION(imap_listscan);
+PHP_FUNCTION(imap_lsub);
+PHP_FUNCTION(imap_lsub_full);
+PHP_FUNCTION(imap_create);
+PHP_FUNCTION(imap_rename);
+PHP_FUNCTION(imap_status);
+PHP_FUNCTION(imap_bodystruct);
+PHP_FUNCTION(imap_fetch_overview);
+PHP_FUNCTION(imap_mail_compose);
+PHP_FUNCTION(imap_alerts);
+PHP_FUNCTION(imap_errors);
+PHP_FUNCTION(imap_last_error);
+PHP_FUNCTION(imap_mail);
+PHP_FUNCTION(imap_search);
+PHP_FUNCTION(imap_utf8);
+PHP_FUNCTION(imap_utf7_decode);
+PHP_FUNCTION(imap_utf7_encode);
+#ifdef HAVE_IMAP_MUTF7
+PHP_FUNCTION(imap_utf8_to_mutf7);
+PHP_FUNCTION(imap_mutf7_to_utf8);
+#endif
+PHP_FUNCTION(imap_mime_header_decode);
+PHP_FUNCTION(imap_thread);
+PHP_FUNCTION(imap_timeout);
+
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+PHP_FUNCTION(imap_get_quota);
+PHP_FUNCTION(imap_get_quotaroot);
+PHP_FUNCTION(imap_set_quota);
+PHP_FUNCTION(imap_setacl);
+PHP_FUNCTION(imap_getacl);
+#endif
+
+
+ZEND_BEGIN_MODULE_GLOBALS(imap)
+	char *imap_user;
+	char *imap_password;
+
+	STRINGLIST *imap_alertstack;
+	ERRORLIST *imap_errorstack;
+
+	STRINGLIST *imap_folders;
+	STRINGLIST *imap_folders_tail;
+	STRINGLIST *imap_sfolders;
+	STRINGLIST *imap_sfolders_tail;
+	MESSAGELIST *imap_messages;
+	MESSAGELIST *imap_messages_tail;
+	FOBJECTLIST *imap_folder_objects;
+	FOBJECTLIST *imap_folder_objects_tail;
+	FOBJECTLIST *imap_sfolder_objects;
+	FOBJECTLIST *imap_sfolder_objects_tail;
+
+	folderlist_style_t folderlist_style;
+	long status_flags;
+	unsigned long status_messages;
+	unsigned long status_recent;
+	unsigned long status_unseen;
+	unsigned long status_uidnext;
+	unsigned long status_uidvalidity;
+#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+	zval **quota_return;
+	zval *imap_acl_list;
+#endif
+	/* php_stream for php_mail_gets() */
+	php_stream *gets_stream;
+ZEND_END_MODULE_GLOBALS(imap)
+
+#ifdef ZTS
+# define IMAPG(v) TSRMG(imap_globals_id, zend_imap_globals *, v)
+#else
+# define IMAPG(v) (imap_globals.v)
+#endif
+
+#else
+
+#define imap_module_ptr NULL
+
+#endif
+
+#define phpext_imap_ptr imap_module_ptr
+
+#endif /* PHP_IMAP_H */
diff --git a/ext/imap/tests/README b/ext/imap/tests/README
new file mode 100644
index 0000000..0d222ad
--- /dev/null
+++ b/ext/imap/tests/README
@@ -0,0 +1,45 @@
+
+Many of the tests in this directory require a mail server to be running, if there is no mail server the test will skip and warn, see skipif.inc for details.
+
+To make the tests run parameters in the skipif.inc and imap_include.inc file will need to be changed to match the local mailserver configuration. 
+
+
+The tests have been checked using dovecot (on Linux 32 and 64 bit systems) and hMailServer on Windows. The tests are intended to be mailserver agnostic.
+
+The tests can be run without modification with a fairly minimal dovecot installation. For information, the dovecot.conf file used in running the tests is given below (after -----). The dovecot password file (dovecotpass) requires a password for one user, webmaster@something.com. It's also necessary to set up one additional user ID (vmail) to own the mail directory.
+
+--------------------------------------------------
+protocols = imap imaps
+
+listen = *
+
+ssl_disable = yes
+
+disable_plaintext_auth=yes
+
+## Mailbox locations and namespaces
+
+mail_location = maildir:/home/vmail/mail/%d/%n/Maildir
+
+auth_verbose = yes
+
+auth_debug = yes
+
+auth default {
+
+  mechanisms = login
+
+  passdb passwd-file {
+    args = /etc/dovecot/dovecotpass
+  }
+
+  userdb static {
+    args = uid=11459 gid=1002 home=/home/vmail/dovecot/mail/%d/%n
+  }
+
+  user = root
+}
+
+
+
+
diff --git a/ext/imap/tests/bug31142_1.phpt b/ext/imap/tests/bug31142_1.phpt
new file mode 100644
index 0000000..efb92b7
--- /dev/null
+++ b/ext/imap/tests/bug31142_1.phpt
@@ -0,0 +1,59 @@
+--TEST--                                 
+Bug #31142 test #1 (imap_mail_compose() generates incorrect output)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+
+$envelope["from"]= "joe@example.com";
+$envelope["to"]  = "foo@example.com";
+$envelope["cc"]  = "bar@example.com";
+
+$part1["type"] = TYPEMULTIPART;
+$part1["subtype"] = "mixed";
+
+$part2["type"] = TYPEAPPLICATION;
+$part2["encoding"] = ENCBINARY;
+$part2["subtype"] = "octet-stream";
+$part2["description"] = "some file";
+$part2["contents.data"] = "ABC";
+
+$part3["type"] = TYPETEXT;
+$part3["subtype"] = "plain";
+$part3["description"] = "description3";
+$part3["contents.data"] = "contents.data3\n\n\n\t";
+
+$body[1] = $part1;
+$body[2] = $part2;
+$body[3] = $part3;
+
+echo imap_mail_compose($envelope, $body);
+
+?>
+--EXPECTF--
+From: joe@example.com
+To: foo@example.com
+cc: bar@example.com
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+--%s
+Content-Type: APPLICATION/octet-stream
+Content-Transfer-Encoding: BASE64
+Content-Description: some file
+
+QUJD
+
+--%s
+Content-Type: TEXT/plain; CHARSET=US-ASCII
+Content-Description: description3
+
+contents.data3
+
+
+	
+--%s--
diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt
new file mode 100644
index 0000000..2a81760
--- /dev/null
+++ b/ext/imap/tests/bug31142_2.phpt
@@ -0,0 +1,30 @@
+--TEST--                                 
+Bug #31142 test #2 (imap_mail_compose() generates incorrect output)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+$envelope["from"]= 'host@domain.com';
+$envelope["return_path"]= 'host@domain.com';
+
+$part1["type"]=TYPETEXT;
+$part1["subtype"]="plain";
+$part1["encoding"]=ENCQUOTEDPRINTABLE ;
+$part1["charset"]='iso-8859-2';
+$part1["contents.data"]=imap_8bit('asn řkl');
+
+$body = array($part1);
+
+echo imap_mail_compose($envelope, $body);
+?>
+--EXPECT--
+From: host@domain.com
+MIME-Version: 1.0
+Content-Type: TEXT/plain; CHARSET=iso-8859-2
+Content-Transfer-Encoding: QUOTED-PRINTABLE
+
+asn =C5=99kl
+\ No newline at end of file
diff --git a/ext/imap/tests/bug32589.phpt b/ext/imap/tests/bug32589.phpt
new file mode 100644
index 0000000..c5030e8
--- /dev/null
+++ b/ext/imap/tests/bug32589.phpt
@@ -0,0 +1,34 @@
+--TEST--                                 
+Bug #32589 (crash inside imap_mail_compose() function)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+$m_envelope["To"] = "mail@example.com";
+$m_part1["type"] = TYPEMULTIPART;
+$m_part1["subtype"] = "mixed";
+$m_part2["type"] = TYPETEXT;
+$m_part2["subtype"] = "plain";
+$m_part2["description"] = "text_message";
+
+$m_part2["charset"] = "ISO-8859-2";
+
+$m_part2["contents.data"] = "hello";
+$m_body[1] = $m_part1;
+$m_body[2] = $m_part2;
+echo imap_mail_compose($m_envelope, $m_body);
+?>
+--EXPECTF--
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+%s
+Content-Type: TEXT/plain; CHARSET=ISO-8859-2
+Content-Description: text_message
+
+hello
+%s
diff --git a/ext/imap/tests/bug35669.phpt b/ext/imap/tests/bug35669.phpt
new file mode 100644
index 0000000..1cc4e70
--- /dev/null
+++ b/ext/imap/tests/bug35669.phpt
@@ -0,0 +1,68 @@
+--TEST--                                 
+Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+	$envelope["from"] = 'Santa <somewhere@northpole.gov>';
+        $envelope["to"]  = 'The bad smurf <bad@smurf.com>';
+        $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500';
+                
+        $multipart["type"] = TYPEMULTIPART;
+        $multipart["subtype"] = "MIXED";
+        $body[] = $multipart; //add multipart stuff
+        
+        $textpart["type"] = TYPEMULTIPART;
+        $textpart["subtype"] = "ALTERNATIVE";
+        $body[] = $textpart; //add body part
+        
+        $plain["type"] = TYPETEXT;
+        $plain["subtype"] = "PLAIN";
+        $plain["charset"] = "iso-8859-1";
+        $plain["encoding"] = ENCQUOTEDPRINTABLE;
+        $plain["description"] = "Plaintype part of message";
+        $plain['disposition'] = "inline";
+        $plain["contents.data"] = 'See mom, it will crash';
+        
+        $body[] = $plain; //next add plain text part
+        
+        $html["type"] = TYPETEXT;
+        $html["subtype"] = "HTML";
+        $html["charset"] = "iso-8859-1";
+        $html["encoding"] = ENCQUOTEDPRINTABLE;
+        $html["description"] = "HTML part of message";
+        $html['disposition'] = "inline";
+        $html["contents.data"] = 'See mom, it will <b>crash</b>';
+        
+        $body[] = $html;
+        
+        echo imap_mail_compose($envelope, $body);
+?>
+--EXPECTF--
+Date: Wed, 04 Jan 2006 19:24:43 -0500
+From: Santa <somewhere@northpole.gov>
+To: The bad smurf <bad@smurf.com>
+MIME-Version: 1.0
+Content-Type: MULTIPART/MIXED; BOUNDARY="%s"
+
+--%s
+Content-Type: TEXT/ALTERNATIVE; CHARSET=US-ASCII
+
+
+--%s
+Content-Type: TEXT/PLAIN; CHARSET=iso-8859-1
+Content-Transfer-Encoding: QUOTED-PRINTABLE
+Content-Description: Plaintype part of message
+
+See mom, it will crash
+--%s
+Content-Type: TEXT/HTML; CHARSET=iso-8859-1
+Content-Transfer-Encoding: QUOTED-PRINTABLE
+Content-Description: HTML part of message
+
+See mom, it will <b>crash</b>
+--%s--
diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt
new file mode 100644
index 0000000..3df81ea
--- /dev/null
+++ b/ext/imap/tests/bug40854.phpt
@@ -0,0 +1,57 @@
+--TEST--                                 
+Bug #40854 (imap_mail_compose() creates an invalid terminator for multipart e-mails)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+$envelope["from"]= "joe@example.com";
+$envelope["to"]  = "foo@example.com";
+$envelope["cc"]  = "bar@example.com";
+
+$part1["type"] = TYPEMULTIPART;
+$part1["subtype"] = "mixed";
+
+$part2["type"] = TYPEAPPLICATION;
+$part2["encoding"] = ENCBINARY;
+$part2["subtype"] = "octet-stream";
+$part2["description"] = 'a.txt';
+$part2["contents.data"] = '';
+
+$part3["type"] = TYPETEXT;
+$part3["subtype"] = "plain";
+$part3["description"] = "description3";
+$part3["contents.data"] = "contents.data3\n\n\n\t";
+
+$body[1] = $part1;
+$body[2] = $part2;
+$body[3] = $part3;
+
+echo imap_mail_compose($envelope, $body);
+?>
+--EXPECTF--
+From: joe@example.com
+To: foo@example.com
+cc: bar@example.com
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+--%s
+Content-Type: APPLICATION/octet-stream
+Content-Transfer-Encoding: BASE64
+Content-Description: a.txt
+
+
+
+--%s
+Content-Type: TEXT/plain; CHARSET=US-ASCII
+Content-Description: description3
+
+contents.data3
+
+
+	
+--%s--
+\ No newline at end of file
diff --git a/ext/imap/tests/bug44098.phpt b/ext/imap/tests/bug44098.phpt
new file mode 100644
index 0000000..f758c11
--- /dev/null
+++ b/ext/imap/tests/bug44098.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #44098 (imap_utf8() returns only capital letters)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+$exp = 'Luzon®14 dot CoM';
+$res = imap_utf8('=?iso-8859-1?b?THV6b26uMTQ=?= dot CoM');
+if ($res != $exp) {
+	echo "failed: got <$res>, expected <exp>\n";
+} else {
+	echo "ok";
+}
+?>
+--EXPECT--
+ok
diff --git a/ext/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt
new file mode 100644
index 0000000..eedaed0
--- /dev/null
+++ b/ext/imap/tests/bug45705_1.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #45705 test #1 (imap rfc822_parse_adrlist() modifies passed address parameter)
+--SKIPIF--
+<?php
+	if (!extension_loaded("imap")) { 
+		die("skip imap extension not available");  
+	}
+?>
+--FILE--
+<?php
+
+$address = 'John Doe <john@example.com>';
+var_dump($address);
+imap_rfc822_parse_adrlist($address, null);
+var_dump($address);
+
+?>
+--EXPECT--
+string(27) "John Doe <john@example.com>"
+string(27) "John Doe <john@example.com>"
diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt
new file mode 100644
index 0000000..797d473
--- /dev/null
+++ b/ext/imap/tests/bug45705_2.phpt
@@ -0,0 +1,53 @@
+--TEST--
+Bug #45705 test #2 (imap rfc822_parse_adrlist() modifies passed address parameter)
+--SKIPIF--
+<?php
+	if (!extension_loaded("imap")) { 
+		die("skip imap extension not available");  
+	}
+?>
+--FILE--
+<?php
+
+$envelope = array('return_path' => 'John Doe <john@example.com>',
+                  'from'        => 'John Doe <john@example.com>',
+                  'reply_to'    => 'John Doe <john@example.com>',
+                  'to'          => 'John Doe <john@example.com>',
+                  'cc'          => 'John Doe <john@example.com>',
+                  'bcc'         => 'John Doe <john@example.com>',
+);
+
+var_dump($envelope);
+imap_mail_compose($envelope, array(1 => array()));
+var_dump($envelope);
+
+?>
+--EXPECT--
+array(6) {
+  ["return_path"]=>
+  string(27) "John Doe <john@example.com>"
+  ["from"]=>
+  string(27) "John Doe <john@example.com>"
+  ["reply_to"]=>
+  string(27) "John Doe <john@example.com>"
+  ["to"]=>
+  string(27) "John Doe <john@example.com>"
+  ["cc"]=>
+  string(27) "John Doe <john@example.com>"
+  ["bcc"]=>
+  string(27) "John Doe <john@example.com>"
+}
+array(6) {
+  ["return_path"]=>
+  string(27) "John Doe <john@example.com>"
+  ["from"]=>
+  string(27) "John Doe <john@example.com>"
+  ["reply_to"]=>
+  string(27) "John Doe <john@example.com>"
+  ["to"]=>
+  string(27) "John Doe <john@example.com>"
+  ["cc"]=>
+  string(27) "John Doe <john@example.com>"
+  ["bcc"]=>
+  string(27) "John Doe <john@example.com>"
+}
diff --git a/ext/imap/tests/bug46918.phpt b/ext/imap/tests/bug46918.phpt
new file mode 100644
index 0000000..351beca
--- /dev/null
+++ b/ext/imap/tests/bug46918.phpt
@@ -0,0 +1,75 @@
+--TEST--
+Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+
+$adds = 'ian eiloart <iane@example.ac.uk>,
+      shuf6@example.ac.uk,
+      blobby,
+      "ian,eiloart"<ian@example.ac.uk>,
+      <@example.com:foo@example.ac.uk>,
+      foo@#,
+      ian@-example.com,
+      ian@one@two';
+$add_arr = imap_rfc822_parse_adrlist($adds, 'example.com');
+var_export($add_arr);
+
+?>
+--EXPECT--
+array (
+  0 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'iane',
+     'host' => 'example.ac.uk',
+     'personal' => 'ian eiloart',
+  )),
+  1 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'shuf6',
+     'host' => 'example.ac.uk',
+  )),
+  2 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'blobby',
+     'host' => 'example.com',
+  )),
+  3 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'ian',
+     'host' => 'example.ac.uk',
+     'personal' => 'ian,eiloart',
+  )),
+  4 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'foo',
+     'host' => 'example.ac.uk',
+     'adl' => '@example.com',
+  )),
+  5 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'foo',
+     'host' => '#',
+  )),
+  6 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'ian',
+     'host' => '-example.com',
+  )),
+  7 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'ian',
+     'host' => 'one',
+  )),
+  8 => 
+  stdClass::__set_state(array(
+     'mailbox' => 'UNEXPECTED_DATA_AFTER_ADDRESS',
+     'host' => '.SYNTAX-ERROR.',
+  )),
+)
+Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in Unknown on line 0
diff --git a/ext/imap/tests/bug53377.phpt b/ext/imap/tests/bug53377.phpt
new file mode 100644
index 0000000..1a2173a
--- /dev/null
+++ b/ext/imap/tests/bug53377.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME header unfolding)
+--SKIPIF--
+<?php
+        if (!extension_loaded("imap")) { 
+                die("skip imap extension not available");  
+        }
+?>
+--FILE--
+<?php
+$s = "=?UTF-8?Q?=E2=82=AC?=";
+$header = "$s\n $s\n\t$s";
+
+var_dump(imap_mime_header_decode($header));
+--EXPECT--
+array(3) {
+  [0]=>
+  object(stdClass)#1 (2) {
+    ["charset"]=>
+    string(5) "UTF-8"
+    ["text"]=>
+    string(3) "€"
+  }
+  [1]=>
+  object(stdClass)#2 (2) {
+    ["charset"]=>
+    string(5) "UTF-8"
+    ["text"]=>
+    string(3) "€"
+  }
+  [2]=>
+  object(stdClass)#3 (2) {
+    ["charset"]=>
+    string(5) "UTF-8"
+    ["text"]=>
+    string(3) "€"
+  }
+}
diff --git a/ext/imap/tests/bug63126.phpt b/ext/imap/tests/bug63126.phpt
new file mode 100644
index 0000000..70fba38
--- /dev/null
+++ b/ext/imap/tests/bug63126.phpt
@@ -0,0 +1,52 @@
+--TEST--
+imap_open() DISABLE_AUTHENTICATOR ignores array param
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$in = imap_open($default_mailbox, $username, $password, OP_HALFOPEN, 1);
+if (!$in) {
+    die("skip could not connect to mailbox $default_mailbox");
+}
+$kerberos = false;
+if (is_array($errors = imap_errors())) {
+    foreach ($errors as $err) {
+        if (strstr($err, 'GSSAPI') || strstr($err, 'Kerberos')) {
+            $kerberos = true;
+        }
+    }
+}
+if (!$kerberos) {
+    die("skip need a GSSAPI/Kerberos aware server");
+}
+?>
+--FILE--
+<?php
+$tests = array(
+    'Array'  => array('DISABLE_AUTHENTICATOR' => array('GSSAPI','NTLM')),
+    'String' => array('DISABLE_AUTHENTICATOR' => 'GSSAPI'),
+);
+require_once(dirname(__FILE__).'/imap_include.inc');
+foreach ($tests as $name => $testparams) {
+    echo "Test for $name\n";
+    $in = imap_open($default_mailbox, $username, $password, OP_HALFOPEN, 1, $testparams);
+    if ($in) {
+        if (is_array($errors = imap_errors())) {
+            foreach ($errors as $err) {
+                if (strstr($err, 'GSSAPI') || strstr($err, 'Kerberos')) {
+                    echo "$err\n";
+                }
+            }
+        }
+    } else {
+        echo "Can't connect\n";
+    }
+}
+echo "Done\n";
+?>
+--EXPECTF--
+Test for Array
+Test for String
+Done
diff --git a/ext/imap/tests/clean.inc b/ext/imap/tests/clean.inc
new file mode 100644
index 0000000..f5e869f
--- /dev/null
+++ b/ext/imap/tests/clean.inc
@@ -0,0 +1,25 @@
+<?php
+include_once(dirname(__FILE__) . '/imap_include.inc');
+
+$imap_stream = imap_open($default_mailbox, $username, $password);
+
+// delete all msgs in default mailbox, i.e INBOX
+$check = imap_check($imap_stream);
+for ($i = 1; $i <= $check->Nmsgs; $i++) {
+	imap_delete($imap_stream, $i); 
+}
+
+$mailboxes = imap_getmailboxes($imap_stream, $server, '*');
+
+foreach($mailboxes as $value) {
+	// Only delete mailboxes with our prefix
+	if (preg_match('/\{.*?\}INBOX\.(.+)/', $value->name, $match) == 1) {
+		if (strlen($match[1]) >= strlen($mailbox_prefix) 
+		&& substr_compare($match[1], $mailbox_prefix, 0, strlen($mailbox_prefix)) == 0) {
+			imap_deletemailbox($imap_stream, $value->name);
+		}
+	}	
+}
+
+imap_close($imap_stream, CL_EXPUNGE); 
+?>
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_8bit_basic.phpt b/ext/imap/tests/imap_8bit_basic.phpt
new file mode 100644
index 0000000..aaa0591
--- /dev/null
+++ b/ext/imap/tests/imap_8bit_basic.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test imap_8bit() function : basic functionality 
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_8bit  ( string $string  )
+ * Description: Convert an 8bit string to a quoted-printable string.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_8bit() : basic functionality ***\n";
+
+var_dump(imap_8bit("String with CRLF at end \r\n"));
+//NB this appears to be a bug in cclient; a space at end of string should be encoded as =20
+var_dump(imap_8bit("String with space at end "));
+var_dump(imap_8bit("String with tabs \t\t in middle"));
+var_dump(imap_8bit("String with tab at end \t"));
+var_dump(imap_8bit("\x00\x01\x02\x03\x04\xfe\xff\x0a\x0d"));
+
+?>
+===Done===
+--EXPECT--
+*** Testing imap_8bit() : basic functionality ***
+string(28) "String with CRLF at end=20
+"
+string(25) "String with space at end "
+string(33) "String with tabs =09=09 in middle"
+string(26) "String with tab at end =09"
+string(27) "=00=01=02=03=04=FE=FF=0A=0D"
+===Done===
diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt
new file mode 100644
index 0000000..ab13ec4
--- /dev/null
+++ b/ext/imap/tests/imap_alerts_error.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test imap_alerts() function : error conditions 
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_alerts(void)
+ * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. 
+ * Source code: ext/imap/php_imap.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing imap_alerts() : error conditions ***\n";
+
+// One argument
+echo "\n-- Testing imap_alerts() function with one argument --\n";
+$extra_arg = 10;;
+var_dump( imap_alerts($extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_alerts() : error conditions ***
+
+-- Testing imap_alerts() function with one argument --
+
+Warning: imap_alerts() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt
new file mode 100644
index 0000000..60847ce
--- /dev/null
+++ b/ext/imap/tests/imap_append_basic.phpt
@@ -0,0 +1,72 @@
+--TEST--
+Test imap_append() function : basic functionality 
+--SKIPIF--
+<?php 
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_append  ( resource $imap_stream  , string $mailbox  , string $message  [, string $options  ] )
+ * Description: Append a string message to a specified mailbox.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_append() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+echo "Create a new mailbox for test\n";
+$imap_stream = setup_test_mailbox("", 0);
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$mb_details = imap_mailboxmsginfo($imap_stream);
+echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; 
+var_dump(imap_append($imap_stream, $mb_details->Mailbox
+                   , "From: webmaster@something.com\r\n"
+                   . "To: info@something.com\r\n"
+                   . "Subject: Test message\r\n"
+                   . "\r\n"
+                   . "this is a test message, please ignore\r\n"
+                   ));
+                   
+var_dump(imap_append($imap_stream, $mb_details->Mailbox
+                   , "From: webmaster@something.com\r\n"
+                   . "To: info@something.com\r\n"
+                   . "Subject: Another test\r\n"
+                   . "\r\n"
+                   . "this is another test message, please ignore it too!!\r\n"
+                   ));     
+                   
+$check = imap_check($imap_stream);
+echo "Msg Count after append : ". $check->Nmsgs . "\n";
+
+echo "List the msg headers\n";
+var_dump(imap_headers($imap_stream));
+
+imap_close($imap_stream);
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_append() : basic functionality ***
+Create a new mailbox for test
+Create a temporary mailbox and add 0 msgs
+.. mailbox '%s' created
+Add a couple of msgs to new mailbox {%s}INBOX.%s
+bool(true)
+bool(true)
+Msg Count after append : 2
+List the msg headers
+array(2) {
+  [0]=>
+  string(%d) "%w%s       1)%s webmaster@something. Test message (%d chars)"
+  [1]=>
+  string(%d) "%w%s       2)%s webmaster@something. Another test (%d chars)"
+}
+===Done===
+
diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt
new file mode 100644
index 0000000..a64be27
--- /dev/null
+++ b/ext/imap/tests/imap_base64_basic.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test imap_base64() function : basic functionality 
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_base64  ( string $text  )
+ * Description: Decode BASE64 encoded text.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_base64() : basic functionality ***\n";
+
+$str = b'This is an example string to be base 64 encoded';
+$base64 = base64_encode($str);
+if (imap_base64($base64) == $str) {
+	echo "TEST PASSED\n";
+} else {
+	echo "TEST FAILED";
+}
+
+$str = b'!£$%^&*()_+-={][];;@~#?/>.<,';
+$base64 = base64_encode($str);
+if (imap_base64($base64) == $str) {
+	echo "TEST PASSED\n";
+} else {
+	echo "TEST FAILED";
+}
+
+$hex = b'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF';
+$base64 = base64_encode($hex);
+if (imap_base64($base64) == $hex) {
+	echo "TEST PASSED\n";
+} else {
+	echo "TEST FAILED";
+}		
+
+?>
+===Done===
+--EXPECT--
+*** Testing imap_base64() : basic functionality ***
+TEST PASSED
+TEST PASSED
+TEST PASSED
+===Done===
diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt
new file mode 100644
index 0000000..bd4eabb
--- /dev/null
+++ b/ext/imap/tests/imap_binary_basic.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test imap_binary() function : basic functionality 
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_binary  ( string $string  )
+ * Description: Convert an 8bit string to a base64 string.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_binary() : basic functionality ***\n";
+
+echo "Encode as short string\n";
+$str = b'This is an example string to be base 64 encoded';
+$base64 = imap_binary($str);
+var_dump(bin2hex($base64));
+
+echo "Encode a string which results in more than 60 charters of output\n"; 
+$str = b'This is a long string with results in more than 60 characters of output';
+$base64 = imap_binary($str);
+var_dump(bin2hex($base64));
+
+echo "Encode a string with special characters\n";
+$str = b'_+-={][];;@~#?/>.<,';
+$base64 = imap_binary($str);
+var_dump(bin2hex($base64));
+
+echo "Encode some hexadecimal data\n";
+$hex = b'x00\x01\x02\x03\x04\x05\x06\xFA\xFB\xFC\xFD\xFE\xFF';
+$base64 = imap_binary($hex);
+var_dump(bin2hex($base64));
+
+?>
+===Done===
+--EXPECTF--
+*** Testing imap_binary() : basic functionality ***
+Encode as short string
+%string|unicode%(136) "5647687063794270637942686269426c654746746347786c49484e30636d6c755a794230627942695a53426959584e6c49445930494756755932396b0d0a5a57513d0d0a"
+Encode a string which results in more than 60 charters of output
+%string|unicode%(200) "56476870637942706379426849477876626d6367633352796157356e4948647064476767636d567a64577830637942706269427462334a6c4948526f0d0a595734674e6a416759326868636d466a64475679637942765a694276645852776458513d0d0a"
+Encode a string with special characters
+%string|unicode%(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a"
+Encode some hexadecimal data
+%string|unicode%(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a"
+===Done===
diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt
new file mode 100644
index 0000000..40f35f0
--- /dev/null
+++ b/ext/imap/tests/imap_body.phpt
@@ -0,0 +1,48 @@
+--TEST--
+imap_body() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_body();
+
+echo  "Checking with incorrect parameter type\n";
+imap_body('');
+imap_body(false);
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+imap_body($stream_id);
+imap_body($stream_id,-1);
+imap_body($stream_id,1,-1);
+
+//Access not existing
+var_dump(imap_body($stream_id, 999, FT_UID));
+
+imap_close($stream_id);
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_body() expects at least 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_body(): Bad message number in %s on line %d
+
+Warning: imap_body(): invalid value for the options parameter in %s on line %d
+
+Warning: imap_body(): Bad message number in %s on line %d
+bool(false)
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
new file mode 100644
index 0000000..0eb4a2b
--- /dev/null
+++ b/ext/imap/tests/imap_body_basic.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test imap_body() function : basic functionality 
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_body  ( resource $imap_stream  , int $msg_number  [, int $options  ] )
+ * Description: Read the message body.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_body() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+echo "Create a new mailbox for test\n";
+$imap_stream = setup_test_mailbox("", 1);
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$check = imap_check($imap_stream);
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+    
+// show body for msg 1
+var_dump(imap_body($imap_stream, 1));
+
+//Access via FT_UID
+var_dump(imap_body($imap_stream, 1, FT_UID));
+
+imap_close($imap_stream);
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_body() : basic functionality ***
+Create a new mailbox for test
+Create a temporary mailbox and add 1 msgs
+.. mailbox '%s' created
+Msg Count in new mailbox: 1
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+===Done===
diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt
new file mode 100644
index 0000000..cc643a6
--- /dev/null
+++ b/ext/imap/tests/imap_bodystruct_basic.phpt
@@ -0,0 +1,93 @@
+--TEST--
+Test imap_bodystruct() function : basic functionality 
+--SKIPIF--
+<?php 
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : object imap_bodystruct  ( resource $imap_stream  , int $msg_number  , string $section  )
+ * Description: Read the structure of a specified body section of a specific message.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing string imap_bodystruct : basic functionality ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+echo "Create a new mailbox for test and add a multipart msgs\n";
+$imap_stream = setup_test_mailbox("", 1, $mailbox, "multipart");
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+echo "\nGet and validate structure of body part 1\n"; 
+
+$m = imap_bodystruct($imap_stream, 1, "1"); 
+ 
+$mandatoryFields = array(
+                    'ifsubtype',
+                    'ifdescription',
+                    'ifid',
+                    'ifdisposition',
+                    'ifdparameters',
+                    'ifparameters',
+                    );
+
+foreach($mandatoryFields as $mf) 
+{
+  if(isValid($m->$mf)) 
+  {
+    echo "$mf is 0 or 1\n";
+  }
+  else
+  {
+    echo "$mf FAIL\n";
+  }
+}
+
+if(is_array($m->parameters)) 
+{
+  echo "parameters is an array\n";
+}
+
+echo "\nTry to get part 4!\n";
+var_dump(imap_bodystruct($imap_stream, 1, "4")); 
+
+imap_close($imap_stream);
+
+function isValid($param) 
+{
+ if(($param == 0) || ($param == 1)) 
+ {
+   $result=true;
+ }
+ else
+ {
+   $result=false;
+ } 
+return $result;
+}
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing string imap_bodystruct : basic functionality ***
+Create a new mailbox for test and add a multipart msgs
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Get and validate structure of body part 1
+ifsubtype is 0 or 1
+ifdescription is 0 or 1
+ifid is 0 or 1
+ifdisposition is 0 or 1
+ifdparameters is 0 or 1
+ifparameters is 0 or 1
+parameters is an array
+
+Try to get part 4!
+bool(false)
+===Done===
diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt
new file mode 100644
index 0000000..4269688
--- /dev/null
+++ b/ext/imap/tests/imap_clearflag_full_basic.phpt
@@ -0,0 +1,127 @@
+--TEST--
+Test imap_clearflag_full() function : basic functionality 
+--SKIPIF--
+<?php 
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_clearflag_full  ( resource $imap_stream  , string $sequence  , string $flag  [, string $options  ] )
+ * Description: Clears flags on messages.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_clearflag_full() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+echo "Create a new mailbox for test\n";
+$imap_stream = setup_test_mailbox("", 10);
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$check = imap_check($imap_stream);
+echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n";
+
+echo "Set some flags\n"; 
+var_dump(imap_setflag_full($imap_stream, "1,3", "\\Seen \\Answered"));
+var_dump(imap_setflag_full($imap_stream, "2,4", "\\Answered"));
+var_dump(imap_setflag_full($imap_stream, "5,7", "\\Flagged \\Deleted"));
+var_dump(imap_setflag_full($imap_stream, "6,8", "\\Deleted"));
+var_dump(imap_setflag_full($imap_stream, "9,10", "\\Draft \\Flagged"));
+
+var_dump(imap_search($imap_stream, "SEEN"));
+var_dump(imap_search($imap_stream, "ANSWERED"));
+var_dump(imap_search($imap_stream, "FLAGGED"));
+var_dump(imap_search($imap_stream, "DELETED"));
+
+var_dump(imap_clearflag_full($imap_stream, "1,4", "\\Answered"));
+var_dump(imap_clearflag_full($imap_stream, "5,6,7,8", "\\Deleted"));
+var_dump(imap_clearflag_full($imap_stream, "9", "\\Flagged"));
+
+var_dump(imap_search($imap_stream, "SEEN"));
+var_dump(imap_search($imap_stream, "ANSWERED"));
+var_dump(imap_search($imap_stream, "FLAGGED"));
+var_dump(imap_search($imap_stream, "DELETED"));
+
+imap_close($imap_stream);
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_clearflag_full() : basic functionality ***
+Create a new mailbox for test
+Create a temporary mailbox and add 10 msgs
+.. mailbox '{%s}%s' created
+Initial msg count in new_mailbox : 10
+Set some flags
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(3)
+}
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+}
+array(4) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(7)
+  [2]=>
+  int(9)
+  [3]=>
+  int(10)
+}
+array(4) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(6)
+  [2]=>
+  int(7)
+  [3]=>
+  int(8)
+}
+bool(true)
+bool(true)
+bool(true)
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(3)
+}
+array(2) {
+  [0]=>
+  int(2)
+  [1]=>
+  int(3)
+}
+array(3) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(7)
+  [2]=>
+  int(10)
+}
+bool(false)
+===Done===
diff --git a/ext/imap/tests/imap_close_basic.phpt b/ext/imap/tests/imap_close_basic.phpt
new file mode 100644
index 0000000..a998530
--- /dev/null
+++ b/ext/imap/tests/imap_close_basic.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test imap_close() function : basic functionality
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_close() : basic functionality ***\n";
+
+// include file for required variables in imap_open()
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialize required variables
+$stream_id = setup_test_mailbox('', 3, $mailbox); // set up temp mailbox with 3 messages
+$options = CL_EXPUNGE;
+
+// mark messages in inbox for deletion
+for ($i = 1; $i < 4; $i++) {
+	imap_delete($stream_id, $i);
+}
+
+// Calling imap_close() with all possible arguments
+echo "\n-- Call to imap_close() with all possible arguments --\n";
+var_dump( imap_close($stream_id, $options) );
+
+// check that CL_EXPUNGE worked
+$stream_id = imap_open($mailbox, $username, $password);
+echo "There are now " . imap_num_msg($stream_id) . " msgs in mailbox '$mailbox'\n";
+
+// Calling imap_close() with mandatory arguments
+echo "\n-- Call to imap_close() with mandatory arguments --\n";
+var_dump( imap_close($stream_id) );
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_close() : basic functionality ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '%sINBOX.phpttest' created
+
+-- Call to imap_close() with all possible arguments --
+bool(true)
+There are now 0 msgs in mailbox '%sINBOX.phpttest'
+
+-- Call to imap_close() with mandatory arguments --
+bool(true)
+===DONE===
diff --git a/ext/imap/tests/imap_close_error.phpt b/ext/imap/tests/imap_close_error.phpt
new file mode 100644
index 0000000..fd32f3e
--- /dev/null
+++ b/ext/imap/tests/imap_close_error.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test imap_close() function : error conditions - incorrect number of args
+--SKIPIF--
+<?php
+require_once (dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to imap_close() to test behaviour
+ */
+
+echo "*** Testing imap_close() : error conditions ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Zero arguments
+echo "\n-- Testing imap_close() function with Zero arguments --\n";
+var_dump( imap_close() );
+
+//Test imap_close with one more than the expected number of arguments
+echo "\n-- Testing imap_close() function with more than expected no. of arguments --\n";
+$stream_id = imap_open($server, $username, $password);
+$options = CL_EXPUNGE;
+$extra_arg = 10;
+var_dump( imap_close($stream_id, $options, $extra_arg) );
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_close() : error conditions ***
+
+-- Testing imap_close() function with Zero arguments --
+
+Warning: imap_close() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+-- Testing imap_close() function with more than expected no. of arguments --
+
+Warning: imap_close() expects at most 2 parameters, 3 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
new file mode 100644
index 0000000..3203905
--- /dev/null
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -0,0 +1,214 @@
+--TEST--
+Test imap_close() function : usage variations - different data types as $stream_id arg
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $stream_id argument to test behaviour of imap_close()
+ */
+
+echo "*** Testing imap_close() : usage variations ***\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $stream_id argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_close()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_close($input) );
+  $iterator++;
+};
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_close() : usage variations ***
+
+-- Iteration 1 --
+
+Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 2 --
+
+Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 3 --
+
+Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 4 --
+
+Warning: imap_close() expects parameter 1 to be resource, integer given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 5 --
+
+Warning: imap_close() expects parameter 1 to be resource, double given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 6 --
+
+Warning: imap_close() expects parameter 1 to be resource, double given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 7 --
+
+Warning: imap_close() expects parameter 1 to be resource, double given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 8 --
+
+Warning: imap_close() expects parameter 1 to be resource, double given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 9 --
+
+Warning: imap_close() expects parameter 1 to be resource, double given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 10 --
+
+Warning: imap_close() expects parameter 1 to be resource, null given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 11 --
+
+Warning: imap_close() expects parameter 1 to be resource, null given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 12 --
+
+Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 13 --
+
+Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 14 --
+
+Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 15 --
+
+Warning: imap_close() expects parameter 1 to be resource, boolean given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 16 --
+
+Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 17 --
+
+Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 18 --
+
+Warning: imap_close() expects parameter 1 to be resource, array given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 19 --
+
+Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 20 --
+
+Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 21 --
+
+Warning: imap_close() expects parameter 1 to be resource, %unicode_string_optional% given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 22 --
+
+Warning: imap_close() expects parameter 1 to be resource, object given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 23 --
+
+Warning: imap_close() expects parameter 1 to be resource, null given in %simap_close_variation1.php on line 80
+NULL
+
+-- Iteration 24 --
+
+Warning: imap_close() expects parameter 1 to be resource, null given in %simap_close_variation1.php on line 80
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt
new file mode 100644
index 0000000..feadfed
--- /dev/null
+++ b/ext/imap/tests/imap_close_variation2.phpt
@@ -0,0 +1,227 @@
+--TEST--
+Test imap_close() function : usage variations - different data types as $options arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $options argument to test behaviour of imap_close()
+ */
+
+echo "*** Testing imap_close() : usage variations ***\n";
+
+// include file for imap_stream
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// create mailbox to test whether options has been set to CL_EXPUNGE
+$stream_id = setup_test_mailbox('', 3, $mailbox);
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// heredoc string
+$heredoc = <<<EOT
+32768
+EOT;
+
+// unexpected values to be passed to $options argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       32768,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "32768",
+       '32768',
+       $heredoc,
+
+       // undefined data
+/*22*/ @$undefined_var,
+
+       // unset data
+/*23*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_close()
+$iterator = 1;
+foreach($inputs as $input) {
+
+	// mark added messages for deletion
+	for ($i = 1; $i < 4; $i++) {
+		imap_delete($stream_id, $i);
+	}
+	echo "\n-- Iteration $iterator --\n";
+	var_dump( $check = imap_close($stream_id, $input) );
+
+	// check that imap_close was successful, if not call imap_close and explicitly set CL_EXPUNGE
+	if(false === $check) {
+		imap_close($stream_id, CL_EXPUNGE);
+	} else {
+		// if imap_close was successful test whether CL_EXPUNGE was set by doing a message count
+		$imap_stream = imap_open($mailbox, $username, $password);
+		$num_msg = imap_num_msg($imap_stream);
+		if ($num_msg != 0) {
+			echo "CL_EXPUNGE was not set, $num_msg msgs in mailbox\n";
+		} else {
+			echo "CL_EXPUNGE was set\n";
+		}
+		// call imap_close with CL_EXPUNGE explicitly set in case mailbox not empty
+		imap_close($imap_stream, CL_EXPUNGE);
+	}
+	$iterator++;
+
+	// get $stream_id for next iteration
+	$stream_id = imap_open($mailbox, $username, $password);
+	populate_mailbox($stream_id, $mailbox, 3);
+
+};
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_close() : usage variations ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 2 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 3 --
+bool(true)
+CL_EXPUNGE was set
+
+-- Iteration 4 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 5 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 6 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 7 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 8 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 9 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 10 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 11 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 12 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 13 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 14 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 15 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 16 --
+
+Warning: imap_close() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 17 --
+
+Warning: imap_close() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 18 --
+
+Warning: imap_close() expects parameter 2 to be long, array given in %s on line %d
+NULL
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 19 --
+bool(true)
+CL_EXPUNGE was set
+
+-- Iteration 20 --
+bool(true)
+CL_EXPUNGE was set
+
+-- Iteration 21 --
+bool(true)
+CL_EXPUNGE was set
+
+-- Iteration 22 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 23 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+===DONE===
diff --git a/ext/imap/tests/imap_close_variation3.phpt b/ext/imap/tests/imap_close_variation3.phpt
new file mode 100644
index 0000000..6f6161a
--- /dev/null
+++ b/ext/imap/tests/imap_close_variation3.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test imap_close() function : usage variations - different streams
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different stream types to imap_close() to test whether it can close them
+ */
+
+echo "*** Testing imap_close() : usage variations ***\n";
+
+echo "\n-- File Resource opened with fopen() --\n";
+var_dump($file_handle = fopen(__FILE__, 'r'));
+var_dump(imap_close($file_handle));
+var_dump($file_handle);
+
+echo "\n-- Directory Resource opened with opendir() --\n";
+var_dump($dir_handle = opendir(dirname(__FILE__)));
+var_dump(imap_close($dir_handle));
+var_dump($dir_handle);
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_close() : usage variations ***
+
+-- File Resource opened with fopen() --
+resource(%d) of type (stream)
+
+Warning: imap_close(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+resource(%d) of type (stream)
+
+-- Directory Resource opened with opendir() --
+resource(%d) of type (stream)
+
+Warning: imap_close(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+resource(%d) of type (stream)
+===DONE===
diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt
new file mode 100644
index 0000000..ca82619
--- /dev/null
+++ b/ext/imap/tests/imap_close_variation4.phpt
@@ -0,0 +1,93 @@
+--TEST--
+Test imap_close() function : usage variations - different ints as $options arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_close(resource $stream_id [, int $options])
+ * Description: Close an IMAP stream 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different integers as $options arg to imap_close() to test which are
+ * recognised as CL_EXPUNGE option
+ */
+
+echo "*** Testing imap_close() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$inputs = array (0, 3.2768e4, -32768, PHP_INT_MAX, -PHP_INT_MAX);
+
+$stream_id = setup_test_mailbox('', 3, $mailbox); // set up temp mailbox with 3 messages
+
+// loop through each element of $inputs to check the behavior of imap_close()
+$iterator = 1;
+foreach($inputs as $input) {
+
+	// mark added messages for deletion
+	for ($i = 1; $i < 4; $i++) {
+		imap_delete($stream_id, $i);
+	}
+	echo "\n-- Iteration $iterator --\n";
+	var_dump( $check = imap_close($stream_id, $input) );
+
+	// check that imap_close was successful, if not call imap_close and explicitly set CL_EXPUNGE
+	if(false === $check) {
+		imap_close($stream_id, CL_EXPUNGE);
+	} else {
+		// if imap_close was successful test whether CL_EXPUNGE was set by doing a message count
+		$imap_stream = imap_open($mailbox, $username, $password);
+		$num_msg = imap_num_msg($imap_stream);
+		if ($num_msg != 0) {
+			echo "CL_EXPUNGE was not set, $num_msg msgs in mailbox\n";
+		} else {
+			echo "CL_EXPUNGE was set\n";
+		}
+		// call imap_close with CL_EXPUNGE explicitly set in case mailbox not empty
+		imap_close($imap_stream, CL_EXPUNGE);
+	}
+	$iterator++;
+
+	// get $stream_id for next iteration
+	$stream_id = imap_open($mailbox, $username, $password);
+	populate_mailbox($stream_id, $mailbox, 3);
+
+};
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_close() : usage variations ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+bool(true)
+CL_EXPUNGE was not set, 3 msgs in mailbox
+
+-- Iteration 2 --
+bool(true)
+CL_EXPUNGE was set
+
+-- Iteration 3 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 4 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+
+-- Iteration 5 --
+
+Warning: imap_close(): invalid value for the flags parameter in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt
new file mode 100644
index 0000000..431d59f
--- /dev/null
+++ b/ext/imap/tests/imap_createmailbox_basic.phpt
@@ -0,0 +1,69 @@
+--TEST--
+Test imap_createmailbox() function : basic functionality 
+--SKIPIF--
+<?php 
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_createmailbox  ( resource $imap_stream  , string $mailbox  )
+ * Description: Creates a new mailbox specified by mailbox .
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_createmailbox() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$imap_stream = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+
+$newname = "phpnewbox";
+
+echo "Newname will be '$newname'\n";
+
+$newbox = imap_utf7_encode($server.$newname);
+if (imap_createmailbox($imap_stream, $newbox)) {
+
+	echo "Add a couple of msgs to '$newname' mailbox\n"; 
+	populate_mailbox($imap_stream, $newbox, 2);	
+
+    $status = imap_status($imap_stream, $newbox, SA_ALL);
+    if ($status) {
+        echo "Your new mailbox '$newname' has the following status:\n";
+        echo "Messages:    " . $status->messages    . "\n";
+        echo "Recent:      " . $status->recent      . "\n";
+        echo "Unseen:      " . $status->unseen      . "\n";
+        echo "UIDnext:     " . $status->uidnext     . "\n";
+        echo "UIDvalidity: " . $status->uidvalidity . "\n";
+       
+    } else {
+        echo "imap_status on new mailbox failed: " . imap_last_error() . "\n";
+    }
+
+    if (imap_deletemailbox($imap_stream, $newbox)) {
+        echo "Mailbox '$newname' removed to restore initial state\n";
+    } else {
+        echo "imap_deletemailbox on new mailbox failed: " . implode("\n", imap_errors()) . "\n";
+    }
+
+} else {
+    echo "could not create new mailbox: " . implode("\n", imap_errors()) . "\n";
+}
+
+imap_close($imap_stream);
+
+?>
+===Done===
+--EXPECTF--
+*** Testing imap_createmailbox() : basic functionality ***
+Newname will be 'phpnewbox'
+Add a couple of msgs to 'phpnewbox' mailbox
+Your new mailbox 'phpnewbox' has the following status:
+Messages:    2
+Recent:      2
+Unseen:      2
+UIDnext:     %d
+UIDvalidity: %d
+Mailbox 'phpnewbox' removed to restore initial state
+===Done===
diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt
new file mode 100644
index 0000000..91be328
--- /dev/null
+++ b/ext/imap/tests/imap_errors_basic.phpt
@@ -0,0 +1,55 @@
+--TEST--
+Test imap_errors() function : basic functionality 
+--SKIPIF--
+<?php 
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_errors  ( void  )
+ * Description: Returns all of the IMAP errors that have occurred.
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_errors() : basic functionality ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+$password = "bogus"; // invalid password to use in this test 
+
+echo "Issue open with invalid password with normal default number of retries, i.e 3\n";
+$mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3);
+
+echo "List any errors\n";
+var_dump(imap_errors()); 
+
+echo "\n\nIssue open with invalid password with retries == 1\n";
+$mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1);
+
+echo "List any errors\n";
+var_dump(imap_errors()); 
+?>
+===Done===
+--EXPECTF--
+*** Testing imap_errors() : basic functionality ***
+Issue open with invalid password with normal default number of retries, i.e 3
+
+Warning: imap_open(): Couldn't open stream %s in %s on line %d
+List any errors
+array(%d) {
+  [0]=>
+  string(%d) "%s"
+  [1]=>
+  string(%d) "%s"
+  [2]=>
+  string(%d) "%a
+}
+
+
+Issue open with invalid password with retries == 1
+
+Warning: imap_open(): Couldn't open stream %s in %s on line %d
+List any errors
+array(%d) {
+  [0]=>
+  string(%d) "%a
+}
+===Done===
diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt
new file mode 100644
index 0000000..d99dcf0
--- /dev/null
+++ b/ext/imap/tests/imap_expunge_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_num_recent() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_num_recent();
+
+echo  "Checking with incorrect parameter type\n";
+imap_num_recent('');
+imap_num_recent(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_num_recent() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_num_recent() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_num_recent() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt
new file mode 100644
index 0000000..83fab12
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_basic.phpt
@@ -0,0 +1,96 @@
+--TEST--
+Test imap_fetch_overview() function : basic functionality 
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_fetch_overview() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// create a new mailbox and add two new messages to it
+$stream_id = setup_test_mailbox('', 2, $mailbox, 'notSimple');
+
+// get UID for new message
+$msg_no = imap_uid($stream_id, 1);
+$options = FT_UID;
+
+// Calling imap_fetch_overview() with all possible arguments
+echo "\n-- All possible arguments --\n";
+$a =  imap_fetch_overview($stream_id, "$msg_no", $options) ;
+echo "\n--> Object #1\n";
+displayOverviewFields($a[0]);
+
+// Calling imap_fetch_overview() with mandatory arguments
+echo "\n-- Mandatory arguments --\n";
+$a = imap_fetch_overview($stream_id, '1:2') ;
+
+//first object in array
+echo "\n--> Object #1\n";
+displayOverviewFields($a[0]);
+
+//Second object in array
+echo "\n--> Object #2\n";
+displayOverviewFields($a[1]);
+
+imap_close($stream_id);
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : basic functionality ***
+Create a temporary mailbox and add 2 msgs
+.. mailbox '{%s}%s' created
+
+-- All possible arguments --
+
+--> Object #1
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- Mandatory arguments --
+
+--> Object #1
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+--> Object #2
+size is %d
+uid is %d
+msgno is 2
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_error.phpt b/ext/imap/tests/imap_fetch_overview_error.phpt
new file mode 100644
index 0000000..e300e62
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_error.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Test imap_fetch_overview() function : error conditions - incorrect number of args
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to imap_fetch_overview() to test behaviour
+ */
+
+echo "*** Testing imap_fetch_overview() : error conditions ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+//Test imap_fetch_overview with one more than the expected number of arguments
+echo "\n-- Testing imap_fetch_overview() function with more than expected no. of arguments --\n";
+$stream_id = setup_test_mailbox('', 2, $mailbox, 'notSimple'); // set up temp mailbox with 2 msgs
+$msg_no = 1;
+$options = FT_UID;
+$extra_arg = 10;
+var_dump( imap_fetch_overview($stream_id, $msg_no, $options, $extra_arg) );
+
+// Testing imap_fetch_overview with one less than the expected number of arguments
+echo "\n-- Testing imap_fetch_overview() function with less than expected no. of arguments --\n";
+var_dump( imap_fetch_overview($stream_id) );
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : error conditions ***
+
+-- Testing imap_fetch_overview() function with more than expected no. of arguments --
+Create a temporary mailbox and add 2 msgs
+.. mailbox '{%s}%s' created
+
+Warning: imap_fetch_overview() expects at most 3 parameters, 4 given in %s on line %d
+NULL
+
+-- Testing imap_fetch_overview() function with less than expected no. of arguments --
+
+Warning: imap_fetch_overview() expects at least 2 parameters, 1 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
new file mode 100644
index 0000000..150c555
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -0,0 +1,221 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - diff data types as $stream_id arg
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $stream_id argument to imap_fetch_overview() to test behaviour
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$msg_no = 1;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $stream_id argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetch_overview()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Testing with first argument value: ";
+  var_dump($input);
+  var_dump( imap_fetch_overview($input, $msg_no) );
+  $iterator++;
+};
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+
+-- Testing with first argument value: int(0)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Testing with first argument value: int(1)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Testing with first argument value: int(12345)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Testing with first argument value: int(-2345)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Testing with first argument value: float(10.5)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Testing with first argument value: float(-10.5)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Testing with first argument value: float(123456789000)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Testing with first argument value: float(1.23456789E-9)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Testing with first argument value: float(0.5)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Testing with first argument value: NULL
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Testing with first argument value: NULL
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Testing with first argument value: bool(true)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Testing with first argument value: bool(false)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Testing with first argument value: bool(true)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Testing with first argument value: bool(false)
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Testing with first argument value: %string|unicode%(0) ""
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Testing with first argument value: %string|unicode%(0) ""
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Testing with first argument value: array(0) {
+}
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, array given in %s on line %d
+NULL
+
+-- Testing with first argument value: %string|unicode%(6) "string"
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Testing with first argument value: %string|unicode%(6) "string"
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Testing with first argument value: %string|unicode%(11) "hello world"
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Testing with first argument value: object(classA)#1 (0) {
+}
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, object given in %s on line %d
+NULL
+
+-- Testing with first argument value: NULL
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Testing with first argument value: NULL
+
+Warning: imap_fetch_overview() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt
new file mode 100644
index 0000000..086885f
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt
@@ -0,0 +1,230 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - diff data types as $msg_no arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $msg_no argument to imap_fetch_overview() to test behaviour
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise function arguments not being substituted
+$stream_id = setup_test_mailbox('', 1, $mailbox, 'notSimple'); // set up temp mailbox with 1 msg
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to <<<ARGUMENT HERE>>> argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+
+       // resource variable
+/*25*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetch_overview()
+$iterator = 1;
+foreach($inputs as $input) {
+	echo "\n-- Testing with second argument value: ";
+	var_dump($input);
+	$overview = imap_fetch_overview($stream_id, $input);
+	if (!$overview) {
+		echo imap_last_error() . "\n";
+	} else {
+		displayOverviewFields($overview[0]);
+        }
+	$iterator++;
+};
+
+fclose($fp);
+
+// clear the error stack
+imap_errors();
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- Testing with second argument value: int(0)
+Sequence out of range
+
+-- Testing with second argument value: int(1)
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- Testing with second argument value: int(12345)
+Sequence out of range
+
+-- Testing with second argument value: int(-2345)
+Syntax error in sequence
+
+-- Testing with second argument value: float(10.5)
+Sequence out of range
+
+-- Testing with second argument value: float(-10.5)
+Syntax error in sequence
+
+-- Testing with second argument value: float(123456789000)
+Sequence out of range
+
+-- Testing with second argument value: float(1.23456789E-9)
+Sequence syntax error
+
+-- Testing with second argument value: float(0.5)
+Sequence out of range
+
+-- Testing with second argument value: NULL
+Sequence out of range
+
+-- Testing with second argument value: NULL
+Sequence out of range
+
+-- Testing with second argument value: bool(true)
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- Testing with second argument value: bool(false)
+Sequence out of range
+
+-- Testing with second argument value: bool(true)
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- Testing with second argument value: bool(false)
+Sequence out of range
+
+-- Testing with second argument value: %string|unicode%(0) ""
+Sequence out of range
+
+-- Testing with second argument value: %string|unicode%(0) ""
+Sequence out of range
+
+-- Testing with second argument value: array(0) {
+}
+
+Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, array given in %s on line %d
+Sequence out of range
+
+-- Testing with second argument value: %string|unicode%(6) "string"
+Syntax error in sequence
+
+-- Testing with second argument value: %string|unicode%(6) "string"
+Syntax error in sequence
+
+-- Testing with second argument value: %string|unicode%(11) "hello world"
+Syntax error in sequence
+
+-- Testing with second argument value: object(classA)#1 (0) {
+}
+Syntax error in sequence
+
+-- Testing with second argument value: NULL
+Syntax error in sequence
+
+-- Testing with second argument value: NULL
+Syntax error in sequence
+
+-- Testing with second argument value: resource(%d) of type (stream)
+
+Warning: imap_fetch_overview() expects parameter 2 to be %binary_string_optional%, resource given in %s on line %d
+Syntax error in sequence
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt
new file mode 100644
index 0000000..7bd78d8
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt
@@ -0,0 +1,80 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - FT_UID option
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Test passing a range of values into the $options argument to imap_fetch_overview():
+ * 1. values that equate to 1
+ * 2. Minimum and maximum PHP values
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise required variables
+$stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one simple message
+$msg_no = 1;
+$msg_uid = imap_uid($stream_id, $msg_no);
+
+$options = array ('1',
+                  true,
+                  1.000000000000001, 
+                  0.00001e5, 
+                  PHP_INT_MAX, 
+                  -PHP_INT_MAX
+                 );
+
+// iterate over each element of $options array 
+$iterator = 1;
+imap_check($stream_id);
+foreach($options as $option) {
+	echo "\nTesting with option value:";
+	var_dump($option);
+	$overview = imap_fetch_overview($stream_id, $msg_uid, $option);
+	if ($overview) {
+                echo "imap_fetch_overview() returns an object\n";
+        }
+	$iterator++;
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Testing with option value:%string|unicode%(1) "1"
+imap_fetch_overview() returns an object
+
+Testing with option value:bool(true)
+imap_fetch_overview() returns an object
+
+Testing with option value:float(1)
+imap_fetch_overview() returns an object
+
+Testing with option value:float(1)
+imap_fetch_overview() returns an object
+
+Testing with option value:int(%d)
+
+Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d
+
+Testing with option value:int(-%d)
+
+Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation4.phpt b/ext/imap/tests/imap_fetch_overview_variation4.phpt
new file mode 100644
index 0000000..a5c2666
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation4.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - different resources as $stream_id
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different resource types to imap_fetch_overview() to test behaviour
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+
+echo "\n-- File Resource opened with fopen() --\n";
+var_dump($file_pointer = fopen(__FILE__, 'r+'));
+var_dump(imap_fetch_overview($file_pointer, 1));
+fclose($file_pointer);
+
+echo "\n-- Directory Resource opened with opendir() --\n";
+var_dump($dir_handle = opendir(dirname(__FILE__)));
+var_dump(imap_fetch_overview($dir_handle, 1));
+closedir($dir_handle);
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+
+-- File Resource opened with fopen() --
+resource(%d) of type (stream)
+
+Warning: imap_fetch_overview(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+
+-- Directory Resource opened with opendir() --
+resource(%d) of type (stream)
+
+Warning: imap_fetch_overview(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt
new file mode 100644
index 0000000..5feeedb
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt
@@ -0,0 +1,138 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - $msg_no argument 
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different sequences/msg numbers as $msg_no argument to test behaviour
+ * of imap_fetch_overview()
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp mailbox with 3 msgs
+
+$sequences = array (0,     4,     '4', // out of range
+                    '2',   '1,3', '1, 2',
+                    '1:3'); // pass uid without setting FT_UID option
+
+foreach($sequences as $msg_no) {
+	echo "\n-- \$msg_no is $msg_no --\n";
+        $overview = imap_fetch_overview($stream_id, $msg_no);
+	if (!$overview) {
+		echo imap_last_error() . "\n";
+        } else {
+		foreach($overview as $ov) {
+			echo "\n";
+			displayOverviewFields($ov);
+       		 }
+        }
+}
+
+// clear error stack
+imap_errors();
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '{%s}%s' created
+
+-- $msg_no is 0 --
+Sequence out of range
+
+-- $msg_no is 4 --
+Sequence out of range
+
+-- $msg_no is 4 --
+Sequence out of range
+
+-- $msg_no is 2 --
+
+size is %d
+uid is %d
+msgno is 2
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- $msg_no is 1,3 --
+
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+size is %d
+uid is %d
+msgno is 3
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+-- $msg_no is 1, 2 --
+Syntax error in sequence
+
+-- $msg_no is 1:3 --
+
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+size is %d
+uid is %d
+msgno is 2
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+
+size is %d
+uid is %d
+msgno is 3
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+===DONE===
diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt
new file mode 100644
index 0000000..bdf0557
--- /dev/null
+++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt
@@ -0,0 +1,109 @@
+--TEST--
+Test imap_fetch_overview() function : usage variations - multipart message
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
+ * Description: Read an overview of the information in the headers of the given message sequence 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass a multipart message to imap_fetch_overview() to test the contents of returned array
+ */
+
+echo "*** Testing imap_fetch_overview() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$stream_id = setup_test_mailbox('', 0, $mailbox); // setup temp mailbox
+create_multipart_message($stream_id, $mailbox);
+
+// refresh msg numbers
+imap_check($stream_id);
+$msg_no = 1;
+
+$a = imap_fetch_overview($stream_id, $msg_no);
+echo "\n--> Object #1\n";
+displayOverviewFields($a[0]);
+
+
+
+
+/**
+ * Create a multipart message with subparts
+ *
+ * @param resource $imap_stream
+ * @param string $mailbox
+ */
+function create_multipart_message($imap_stream, $mailbox) {
+	global $users, $domain;
+	$envelope["from"]= "foo@anywhere.com";
+	$envelope["to"]  = "$users[0]@$domain";
+	$envelope["subject"] = "Test msg 1";
+
+	$part1["type"] = TYPEMULTIPART;
+	$part1["subtype"] = "mixed";
+		
+	$part2["type"] = TYPETEXT;
+	$part2["subtype"] = "plain";
+	$part2["description"] = "imap_mail_compose() function";
+	$part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx";
+		
+	$part3["type"] = TYPETEXT;
+	$part3["subtype"] = "plain";
+	$part3["description"] = "Example";
+	$part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy";
+		
+	$file_handle = fopen(__FILE__, 'r+');
+	$file_size = 1;
+
+	$part4["type"] = TYPEAPPLICATION;
+	$part4["encoding"] = ENCBASE64;
+	$part4["subtype"] = "octet-stream";
+	$part4["description"] = 'Test';
+	$part4['disposition.type'] = 'attachment';
+	$part4['disposition'] = array ('filename' => 'Test');
+	$part4['type.parameters'] = array('name' => 'Test');
+	$part4["contents.data"] = base64_encode(fread($file_handle, 1));
+		
+	$body[1] = $part1;
+	$body[2] = $part2;
+	$body[3] = $part3;
+	$body[4] = $part4;
+		
+	$msg = imap_mail_compose($envelope, $body);
+
+	if (imap_append($imap_stream, $mailbox, $msg) === false) {
+		echo imap_last_error() . "\n";
+		echo "TEST FAILED : could not append new message to mailbox '$mailbox'\n";
+		exit;
+	}
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetch_overview() : usage variations ***
+Create a temporary mailbox and add 0 msgs
+.. mailbox '{%s}%s' created
+
+--> Object #1
+size is %d
+uid is %d
+msgno is 1
+recent is %d
+flagged is 0
+answered is 0
+deleted is 0
+seen is 0
+draft is 0
+udate is OK
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt
new file mode 100644
index 0000000..66b84b1
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_basic.phpt
@@ -0,0 +1,81 @@
+--TEST--
+Test imap_fetchbody() function : basic functionality
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *           [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_fetchbody() : basic functionality ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise all required variables
+
+// set up mailbox with one message
+$stream_id = setup_test_mailbox('', 1, $mailbox, 'notSimple');
+
+$msg_no = 1;
+$section = '2';
+$options = array ('FT_UID' => FT_UID, 'FT_PEEK' => FT_PEEK, 'FT_INTERNAL' => FT_INTERNAL);
+
+// Calling imap_fetchbody() with all possible arguments
+echo "\n-- All possible arguments --\n";
+foreach ($options as $key => $option) {
+	echo "-- Option is $key --\n";
+	switch ($key) {
+
+		case 'FT_UID';
+		$msg_uid = imap_uid($stream_id, $msg_no);
+		var_dump( imap_fetchbody($stream_id, $msg_uid, $section, $option) );
+		break;
+		
+		case 'FT_PEEK';
+		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
+		$overview = imap_fetch_overview($stream_id, 1);
+		echo "Seen Flag: ";
+		var_dump( $overview[0]->seen );
+		break;
+		
+		case 'FT_INTERNAL';
+		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
+		break;
+
+	}
+}
+
+// Calling imap_fetchbody() with mandatory arguments
+echo "\n-- Mandatory arguments --\n";
+var_dump( imap_fetchbody($stream_id, $msg_no, $section) );
+$overview = imap_fetch_overview($stream_id, 1);
+echo "Seen Flag: ";
+var_dump( $overview[0]->seen );
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : basic functionality ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- All possible arguments --
+-- Option is FT_UID --
+%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+-- Option is FT_PEEK --
+%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+Seen Flag: int(%d)
+-- Option is FT_INTERNAL --
+%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+
+-- Mandatory arguments --
+%unicode|string%(36) "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy"
+Seen Flag: int(%d)
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_error.phpt b/ext/imap/tests/imap_fetchbody_error.phpt
new file mode 100644
index 0000000..f496fbd
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_error.phpt
@@ -0,0 +1,57 @@
+--TEST--
+Test imap_fetchbody() function : error conditions - incorrect number of args
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  :string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *          [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to imap_fetchbody() to test behaviour
+ */
+
+echo "*** Testing imap_fetchbody() : error conditions ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+//Test imap_fetchbody with one more than the expected number of arguments
+echo "\n-- Testing imap_fetchbody() function with more than expected no. of arguments --\n";
+
+$stream_id = setup_test_mailbox('', 1); // set up temp mailbox with 1 simple msg
+$msg_no = 1;
+$section = '1';
+$options = FT_PEEK;
+$extra_arg = 10;
+
+var_dump( imap_fetchbody($stream_id, $msg_no, $section, $options, $extra_arg) );
+
+// Testing imap_fetchbody with one less than the expected number of arguments
+echo "\n-- Testing imap_fetchbody() function with less than expected no. of arguments --\n";
+
+var_dump( imap_fetchbody($stream_id, $msg_no) );
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : error conditions ***
+
+-- Testing imap_fetchbody() function with more than expected no. of arguments --
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Warning: imap_fetchbody() expects at most 4 parameters, 5 given in %s on line %d
+NULL
+
+-- Testing imap_fetchbody() function with less than expected no. of arguments --
+
+Warning: imap_fetchbody() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
new file mode 100644
index 0000000..5f587df
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -0,0 +1,219 @@
+--TEST--
+Test imap_fetchbody() function : usage variation - diff data types as $stream_id arg
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *           [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $stream_id argument to test behaviour of imap_fetchbody()
+ */
+
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$msg_no = 1;
+$section = '2';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $stream_id argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetchbody()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_fetchbody($input, $msg_no, $section) );
+  $iterator++;
+}
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+
+-- Iteration 1 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+NULL
+
+-- Iteration 2 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+NULL
+
+-- Iteration 3 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+NULL
+
+-- Iteration 4 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, integer given in %s on line 85
+NULL
+
+-- Iteration 5 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, double given in %s on line 85
+NULL
+
+-- Iteration 6 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, double given in %s on line 85
+NULL
+
+-- Iteration 7 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, double given in %s on line 85
+NULL
+
+-- Iteration 8 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, double given in %s on line 85
+NULL
+
+-- Iteration 9 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, double given in %s on line 85
+NULL
+
+-- Iteration 10 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, null given in %s on line 85
+NULL
+
+-- Iteration 11 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, null given in %s on line 85
+NULL
+
+-- Iteration 12 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+NULL
+
+-- Iteration 13 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+NULL
+
+-- Iteration 14 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+NULL
+
+-- Iteration 15 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, boolean given in %s on line 85
+NULL
+
+-- Iteration 16 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+NULL
+
+-- Iteration 17 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+NULL
+
+-- Iteration 18 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, array given in %s on line 85
+NULL
+
+-- Iteration 19 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+NULL
+
+-- Iteration 20 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+NULL
+
+-- Iteration 21 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line 85
+NULL
+
+-- Iteration 22 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, object given in %s on line 85
+NULL
+
+-- Iteration 23 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, null given in %s on line 85
+NULL
+
+-- Iteration 24 --
+
+Warning: imap_fetchbody() expects parameter 1 to be resource, null given in %s on line 85
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt
new file mode 100644
index 0000000..64b7a32
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation2.phpt
@@ -0,0 +1,221 @@
+--TEST--
+Test imap_fetchbody() function : usage variation - diff data types as $msg_no arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *           [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $msg_no argument to test behaviour of imap_fetchbody()
+ */
+
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise function arguments not being substituted
+$stream_id = setup_test_mailbox('', 1); // set up temp mailbox with 1 simple msg
+$section = '1';
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $msg_no argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetchbody()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_fetchbody($stream_id, $input, $section) );
+  $iterator++;
+};
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 2 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 3 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 4 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 5 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 6 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 7 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 8 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 9 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 10 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 11 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 12 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 13 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 14 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 15 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 16 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 17 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 18 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+-- Iteration 19 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 20 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 21 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 22 --
+
+Warning: imap_fetchbody() expects parameter 2 to be long, object given in %s on line %d
+NULL
+
+-- Iteration 23 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 24 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt
new file mode 100644
index 0000000..dc1778e
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation3.phpt
@@ -0,0 +1,217 @@
+--TEST--
+Test imap_fetchbody() function : usage variation - diff data types as $section arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *           [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $section argument to test behaviour of imap_fetchbody()
+ */
+
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise function arguments not being substituted
+$stream_id = setup_test_mailbox('', 1); // set up temp mailbox with 1 simple msg
+$msg_no = 1;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// unexpected values to be passed to $section argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+       array(),
+
+       // string data
+/*19*/ "string",
+       'string',
+       $heredoc,
+       
+       // object data
+/*22*/ new classA(),
+
+       // undefined data
+/*23*/ @$undefined_var,
+
+       // unset data
+/*24*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetchbody()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_fetchbody($stream_id, $msg_no, $input) );
+  $iterator++;
+};
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '%s.phpttest' created
+
+-- Iteration 1 --
+string(71) "From: %s
+To: %s
+Subject: test1
+
+"
+
+-- Iteration 2 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 3 --
+%unicode|string%(0) ""
+
+-- Iteration 4 --
+%unicode|string%(0) ""
+
+-- Iteration 5 --
+%unicode|string%(0) ""
+
+-- Iteration 6 --
+%unicode|string%(0) ""
+
+-- Iteration 7 --
+%unicode|string%(0) ""
+
+-- Iteration 8 --
+%unicode|string%(0) ""
+
+-- Iteration 9 --
+%unicode|string%(0) ""
+
+-- Iteration 10 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 11 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 12 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 13 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 14 --
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- Iteration 15 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 16 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 17 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 18 --
+
+Warning: imap_fetchbody() expects parameter 3 to be %unicode_string_optional%, array given in %s on line 87
+NULL
+
+-- Iteration 19 --
+%unicode|string%(0) ""
+
+-- Iteration 20 --
+%unicode|string%(0) ""
+
+-- Iteration 21 --
+%unicode|string%(0) ""
+
+-- Iteration 22 --
+%unicode|string%(0) ""
+
+-- Iteration 23 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+
+-- Iteration 24 --
+%unicode|string%(%d) "From: %s
+To: %s
+Subject: test1
+
+1: this is a test message, please ignore%a"
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt
new file mode 100644
index 0000000..d8126bc
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation4.phpt
@@ -0,0 +1,79 @@
+--TEST--
+Test imap_fetchbody() function : usage variations - FT_UID option
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Test if FT_UID is set by passing the following as $options argument to imap_fetchbody():
+ * 1. values that equate to 1
+ * 2. Minimum and maximum PHP values
+ */
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise required variables
+$stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one simple message
+$msg_no = 1;
+$msg_uid = imap_uid($stream_id, $msg_no);
+$section = 1;
+
+//Note: the first four values are valid as they will all be cast to 1L.
+$options = array ('1', true, 
+                  1.000000000000001, 0.00001e5, 
+                  PHP_INT_MAX, -PHP_INT_MAX);
+
+// iterate over each element of $options array to test whether FT_UID is set
+$iterator = 1;
+imap_check($stream_id);
+foreach($options as $option) {
+	echo "\n-- Iteration $iterator --\n";
+	if(is_string(imap_fetchbody($stream_id, $msg_uid, $section, $option))) {
+		echo "FT_UID valid\n";
+	} else {
+                echo "FT_UID not valid\n";
+        }
+	$iterator++;
+}
+
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+FT_UID valid
+
+-- Iteration 2 --
+FT_UID valid
+
+-- Iteration 3 --
+FT_UID valid
+
+-- Iteration 4 --
+FT_UID valid
+
+-- Iteration 5 --
+
+Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d
+FT_UID not valid
+
+-- Iteration 6 --
+
+Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d
+FT_UID not valid
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation5.phpt b/ext/imap/tests/imap_fetchbody_variation5.phpt
new file mode 100644
index 0000000..dfc5e9f
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation5.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Test imap_fetchbody() function : usage variation - different resources as $stream_id arg
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+ *           [, int options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different resource types to imap_fetchbody() to test behaviour
+ */
+
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+echo "\n-- File Resource opened with fopen() --\n";
+var_dump($file_pointer = fopen(__FILE__, 'r+'));
+var_dump(imap_fetchbody($file_pointer, 1));
+fclose($file_pointer);
+
+echo "\n-- Directory Resource opened with opendir() --\n";
+var_dump($dir_handle = opendir(dirname(__FILE__)));
+var_dump(imap_fetchbody($dir_handle, 1));
+closedir($dir_handle);
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+
+-- File Resource opened with fopen() --
+resource(5) of type (stream)
+
+Warning: imap_fetchbody() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+
+-- Directory Resource opened with opendir() --
+resource(6) of type (stream)
+
+Warning: imap_fetchbody() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt
new file mode 100644
index 0000000..52a50a7
--- /dev/null
+++ b/ext/imap/tests/imap_fetchbody_variation6.phpt
@@ -0,0 +1,70 @@
+--TEST--
+Test imap_fetchbody() function : usage variations - $msg_no arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
+ * Description: Get a specific body section 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different integers, strings, msg sequences and msg UIDs as $msg_no argument
+ * to test behaviour of imap_fetchbody()
+ */
+
+echo "*** Testing imap_fetchbody() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+//Initialise required variables
+$stream_id = setup_test_mailbox('', 3); // set up temp mailbox with  simple msgs
+$section = 1;
+
+$sequences = array (0,     4, // out of range
+                    '1,3', '1:3', // message sequences instead of numbers
+                   );
+
+foreach($sequences as $msg_no) {
+	echo "\n-- \$msg_no is $msg_no --\n";
+	var_dump($overview = imap_fetchbody($stream_id, $msg_no, $section));
+	if (!$overview) {
+		echo imap_last_error() . "\n";
+	}
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchbody() : usage variations ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '{%s}%s' created
+
+-- $msg_no is 0 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+
+-- $msg_no is 4 --
+
+Warning: imap_fetchbody(): Bad message number in %s on line %d
+bool(false)
+
+
+-- $msg_no is 1,3 --
+
+Notice: A non well formed numeric value encountered in %s on line %d
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+
+-- $msg_no is 1:3 --
+
+Notice: A non well formed numeric value encountered in %s on line %d
+%unicode|string%(%d) "1: this is a test message, please ignore%a"
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt
new file mode 100644
index 0000000..5502c55
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_basic.phpt
@@ -0,0 +1,83 @@
+--TEST--
+Test imap_fetchheader() function : basic function
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_fetchheader() : basic functionality ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise all required variables
+$stream_id = setup_test_mailbox('', 1, $mailbox, 'multiPart'); // setup temp mailbox with 1 msg
+$msg_no = 1;
+$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, 
+                 'FT_PREFETCHTEXT' => FT_PREFETCHTEXT);
+
+// Calling imap_fetchheader() with all possible arguments
+echo "\n-- All possible arguments --\n";
+foreach ($options as $key => $option) {
+	echo "-- Option is $key --\n";
+	if ($key == 'FT_UID') {
+		$msg_uid = imap_uid($stream_id, $msg_no);
+		var_dump(imap_fetchheader($stream_id, $msg_uid, $option));
+	} else {
+		var_dump(imap_fetchheader($stream_id, $msg_no, $option));
+	}
+}
+
+// Calling imap_fetchheader() with mandatory arguments
+echo "\n-- Mandatory arguments --\n";
+var_dump( imap_fetchheader($stream_id, $msg_no) );
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchheader() : basic functionality ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '%s.phpttest' created
+
+-- All possible arguments --
+-- Option is FT_UID --
+string(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: %s; %s
+
+"
+-- Option is FT_INTERNAL --
+string(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: %s; %s
+
+"
+-- Option is FT_PREFETCHTEXT --
+string(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: %s; %s
+
+"
+
+-- Mandatory arguments --
+string(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: %s; %s
+
+"
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_error.phpt b/ext/imap/tests/imap_fetchheader_error.phpt
new file mode 100644
index 0000000..e2f5b12
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_error.phpt
@@ -0,0 +1,49 @@
+--TEST--
+Test imap_fetchheader() function : error conditions - incorrect number of args
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass an incorrect number of arguments to imap_fetchheader() to test behaviour
+ */
+
+echo "*** Testing imap_fetchheader() : error conditions ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+//Test imap_fetchheader with one more than the expected number of arguments
+echo "\n-- Testing imap_fetchheader() function with more than expected no. of arguments --\n";
+
+$stream_id = imap_open($server, $username, $password);
+$msg_no = 10;
+$options = 10;
+$extra_arg = 10;
+var_dump( imap_fetchheader($stream_id, $msg_no, $options, $extra_arg) );
+
+// Testing imap_fetchheader with one less than the expected number of arguments
+echo "\n-- Testing imap_fetchheader() function with less than expected no. of arguments --\n";
+var_dump( imap_fetchheader($stream_id) );
+
+imap_close($stream_id);
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchheader() : error conditions ***
+
+-- Testing imap_fetchheader() function with more than expected no. of arguments --
+
+Warning: imap_fetchheader() expects at most 3 parameters, 4 given in %s on line %d
+NULL
+
+-- Testing imap_fetchheader() function with less than expected no. of arguments --
+
+Warning: imap_fetchheader() expects at least 2 parameters, 1 given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
new file mode 100644
index 0000000..0c0e9e1
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -0,0 +1,245 @@
+--TEST--
+Test imap_fetchheader() function : usage variations - diff data types as $stream_id arg
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $stream_id argument to test behaviour of imap_fetchheader()
+ */
+
+echo "*** Testing imap_fetchheader() : usage variations ***\n";
+
+// Initialise function arguments not being substituted
+$msg_no = 1;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// get different types of array
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $stream_id argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // array data
+/*21*/ array(),
+       $index_array,
+       $assoc_array,
+       array('foo', $index_array, $assoc_array),
+       
+       
+       // object data
+/*25*/ new classA(),
+
+       // undefined data
+/*26*/ @$undefined_var,
+
+       // unset data
+/*27*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetchheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_fetchheader($input, $msg_no) );
+  $iterator++;
+};
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchheader() : usage variations ***
+
+-- Iteration 1 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Iteration 2 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Iteration 3 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Iteration 4 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, integer given in %s on line %d
+NULL
+
+-- Iteration 5 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Iteration 6 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Iteration 7 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Iteration 8 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Iteration 9 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, double given in %s on line %d
+NULL
+
+-- Iteration 10 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Iteration 11 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Iteration 12 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Iteration 13 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Iteration 14 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Iteration 15 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
+
+-- Iteration 16 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 17 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 18 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 19 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 20 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 21 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, array given in %s on line %d
+NULL
+
+-- Iteration 22 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, array given in %s on line %d
+NULL
+
+-- Iteration 23 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, array given in %s on line %d
+NULL
+
+-- Iteration 24 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, array given in %s on line %d
+NULL
+
+-- Iteration 25 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, object given in %s on line %d
+NULL
+
+-- Iteration 26 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+-- Iteration 27 --
+
+Warning: imap_fetchheader() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt
new file mode 100644
index 0000000..fe11577
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_variation2.phpt
@@ -0,0 +1,274 @@
+--TEST--
+Test imap_fetchheader() function : usage variations - diff data types for $msg_no arg
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different data types as $msg_no argument to test behaviour of imap_fetchheader()
+ */
+
+echo "*** Testing imap_fetchheader() : usage variations ***\n";
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise function arguments not being substituted
+$stream_id = setup_test_mailbox('', 1, $mailbox, 'notSimple'); // set up temp mailbox with 1 msg
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// get a class
+class classA
+{
+  public function __toString() {
+    return "Class A object";
+  }
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// get a resource variable
+$fp = fopen(__FILE__, "r");
+
+// unexpected values to be passed to $msg_no argument
+$inputs = array(
+
+       // int data
+/*1*/  0,
+       1,
+       12345,
+       -2345,
+
+       // float data
+/*5*/  10.5,
+       -10.5,
+       12.3456789000e10,
+       12.3456789000E-10,
+       .5,
+
+       // null data
+/*10*/ NULL,
+       null,
+
+       // boolean data
+/*12*/ true,
+       false,
+       TRUE,
+       FALSE,
+       
+       // empty data
+/*16*/ "",
+       '',
+
+       // string data
+/*18*/ "string",
+       'string',
+       $heredoc,
+       
+       // array data
+/*21*/ array(),
+       $index_array,
+       $assoc_array,
+       array('foo', $index_array, $assoc_array),
+       
+       
+       // object data
+/*25*/ new classA(),
+
+       // undefined data
+/*26*/ @$undefined_var,
+
+       // unset data
+/*27*/ @$unset_var,
+
+       // resource variable
+/*28*/ $fp
+);
+
+// loop through each element of $inputs to check the behavior of imap_fetchheader()
+$iterator = 1;
+foreach($inputs as $input) {
+  echo "\n-- Iteration $iterator --\n";
+  var_dump( imap_fetchheader($stream_id, $input) );
+  $iterator++;
+};
+
+fclose($fp);
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchheader() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 2 --
+%unicode|string%(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+"
+
+-- Iteration 3 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 4 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 5 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 6 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 7 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 8 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 9 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 10 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 11 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 12 --
+%unicode|string%(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+"
+
+-- Iteration 13 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 14 --
+%unicode|string%(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+"
+
+-- Iteration 15 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 16 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 17 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 18 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 19 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 20 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, %unicode_string_optional% given in %s on line %d
+NULL
+
+-- Iteration 21 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+-- Iteration 22 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+-- Iteration 23 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+-- Iteration 24 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, array given in %s on line %d
+NULL
+
+-- Iteration 25 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, object given in %s on line %d
+NULL
+
+-- Iteration 26 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 27 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+-- Iteration 28 --
+
+Warning: imap_fetchheader() expects parameter 2 to be long, resource given in %s on line %d
+NULL
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt
new file mode 100644
index 0000000..feba766
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_variation3.phpt
@@ -0,0 +1,77 @@
+--TEST--
+Test imap_fetchheader() function : usage variations - FT_UID option
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Test if FT_UID is set by passing the following as $options argument to imap_fetchheader():
+ * 1. values that equate to 1
+ * 2. Minimum and maximum PHP values
+ */
+
+echo "*** Testing imap_fetchheader() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+// Initialise required variables
+$stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one simple message
+$msg_no = 1;
+$msg_uid = imap_uid($stream_id, $msg_no);
+
+$options = array ('1', true, 
+                  1.000000000000001, 0.00001e5, 
+                  PHP_INT_MAX, -PHP_INT_MAX);
+
+// iterate over each element of $options array to test whether FT_UID is set
+$iterator = 1;
+imap_check($stream_id);
+foreach($options as $option) {
+	echo "\n-- Iteration $iterator --\n";
+	if(is_string(imap_fetchheader($stream_id, $msg_uid, $option))) {
+		echo "FT_UID valid\n";
+	} else {
+                echo "FT_UID not valid\n";
+        }
+	$iterator++;
+}
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchheader() : usage variations ***
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+-- Iteration 1 --
+FT_UID valid
+
+-- Iteration 2 --
+FT_UID valid
+
+-- Iteration 3 --
+FT_UID valid
+
+-- Iteration 4 --
+FT_UID valid
+
+-- Iteration 5 --
+
+Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d
+FT_UID not valid
+
+-- Iteration 6 --
+
+Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d
+FT_UID not valid
+===DONE===
diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt
new file mode 100644
index 0000000..b4b19e3
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_variation4.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test imap_fetchheader() function : usage variations - diff resource types as $stream_id
+--SKIPIF--
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different types of resources to imap_fetchheader() to test behaviour
+ */
+
+echo "*** Testing imap_fetchheader() : usage variations ***\n";
+
+echo "\n-- File Resource opened with fopen() --\n";
+var_dump($file_pointer = fopen(__FILE__, 'r+'));
+var_dump(imap_fetchheader($file_pointer, 1));
+fclose($file_pointer);
+
+echo "\n-- Directory Resource opened with opendir() --\n";
+var_dump($dir_handle = opendir(dirname(__FILE__)));
+var_dump(imap_fetchheader($dir_handle, 1));
+closedir($dir_handle);
+?>
+===DONE===
+--EXPECTF--
+*** Testing imap_fetchheader() : usage variations ***
+
+-- File Resource opened with fopen() --
+resource(%d) of type (stream)
+
+Warning: imap_fetchheader(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+
+-- Directory Resource opened with opendir() --
+resource(%d) of type (stream)
+
+Warning: imap_fetchheader(): supplied resource is not a valid imap resource in %s on line %d
+bool(false)
+===DONE===
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt
new file mode 100644
index 0000000..ed2aa84
--- /dev/null
+++ b/ext/imap/tests/imap_fetchheader_variation5.phpt
@@ -0,0 +1,83 @@
+--TEST--
+Test imap_fetchheader() function : usage variations - $msg_no argument
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
+ * Description: Get the full unfiltered header for a message 
+ * Source code: ext/imap/php_imap.c
+ */
+
+/*
+ * Pass different integers and strings as $msg_no argument 
+ * to test behaviour of imap_fetchheader()
+ */
+
+echo "*** Testing imap_fetchheader() : usage variations ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+$stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp mailbox with 3 msgs
+
+$sequences = array (0,     4, // out of range
+                    '1,3', '1:3', // message sequences instead of numbers
+                    ); 
+
+foreach($sequences as $msg_no) {
+	echo "\n-- \$msg_no is $msg_no --\n";
+	var_dump($overview = imap_fetchheader($stream_id, $msg_no));
+	if (!$overview) {
+		echo imap_last_error() . "\n";
+	}
+}
+
+// clear error stack
+imap_errors();
+?>
+===DONE===
+--CLEAN--
+<?php
+require_once(dirname(__FILE__).'/clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_fetchheader() : usage variations ***
+Create a temporary mailbox and add 3 msgs
+.. mailbox '{%s}%s' created
+
+-- $msg_no is 0 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+
+-- $msg_no is 4 --
+
+Warning: imap_fetchheader(): Bad message number in %s on line %d
+bool(false)
+
+
+-- $msg_no is 1,3 --
+
+Notice: A non well formed numeric value encountered in %s on line %d
+%unicode|string%(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+"
+
+-- $msg_no is 1:3 --
+
+Notice: A non well formed numeric value encountered in %s on line %d
+%unicode|string%(%d) "From: foo@anywhere.com
+Subject: Test msg 1
+To: %s
+MIME-Version: 1.0
+Content-Type: MULTIPART/mixed; BOUNDARY="%s"
+
+"
+===DONE===
diff --git a/ext/imap/tests/imap_fetchstructure_basic.phpt b/ext/imap/tests/imap_fetchstructure_basic.phpt
new file mode 100644
index 0000000..7ad4fc5
--- /dev/null
+++ b/ext/imap/tests/imap_fetchstructure_basic.phpt
@@ -0,0 +1,70 @@
+--TEST--
+imap_fetchstructure() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_fetchstructure();
+
+echo  "Checking with incorrect parameter type\n";
+imap_fetchstructure('');
+imap_fetchstructure(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = setup_test_mailbox('', 1);
+
+imap_fetchstructure($stream_id);
+imap_fetchstructure($stream_id,0);
+
+$z = imap_fetchstructure($stream_id,1);
+
+
+$fields = array('type','encoding','ifsubtype','subtype',
+'ifdescription','lines','bytes','parameters');
+
+foreach ($fields as $key) {
+	var_dump(isset($z->$key));
+}
+var_dump($z->type);
+var_dump($z->encoding);
+var_dump($z->bytes);
+var_dump($z->lines);
+var_dump(is_object($z->parameters));
+
+imap_close($stream_id);
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_fetchstructure() expects at least 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_fetchstructure() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_fetchstructure() expects at least 2 parameters, 1 given in %s on line %d
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Warning: imap_fetchstructure() expects at least 2 parameters, 1 given in %s on line %d
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+int(%d)
+int(%d)
+int(%d)
+int(%d)
+bool(true)
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
new file mode 100644
index 0000000..f8e6201
--- /dev/null
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -0,0 +1,35 @@
+--TEST--
+imap_gc() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_gc();
+
+echo  "Checking with incorrect parameter type\n";
+imap_gc('', false);
+imap_gc(false, false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+imap_gc($stream_id, -1);
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_gc() expects exactly 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_gc() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_gc() expects parameter 1 to be resource, boolean given in %s on line %d
+
+Warning: imap_gc(): invalid value for the flags parameter in %s on line %d
diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt
new file mode 100644
index 0000000..ba8a42d
--- /dev/null
+++ b/ext/imap/tests/imap_getsubscribed_basic.phpt
@@ -0,0 +1,68 @@
+--TEST--
+imap_getsubscribed() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_getsubscribed();
+
+echo  "Checking with incorrect parameter type\n";
+imap_getsubscribed('');
+imap_getsubscribed(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+
+imap_getsubscribed($stream_id);
+imap_getsubscribed($stream_id,$default_mailbox);
+var_dump(imap_getsubscribed($stream_id,$default_mailbox,'ezDvfXvbvcxSerz'));
+
+
+echo "Checking OK\n";
+
+$newbox = $default_mailbox . "." . $mailbox_prefix;
+
+imap_createmailbox($stream_id, $newbox);
+imap_subscribe($stream_id, $newbox);
+
+$z = imap_getsubscribed($stream_id,$default_mailbox,'*');
+
+var_dump(is_array($z));
+var_dump($z[0]);
+
+imap_close($stream_id);
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_getsubscribed() expects exactly 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_getsubscribed() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_getsubscribed() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_getsubscribed() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_getsubscribed() expects exactly 3 parameters, 2 given in %s on line %d
+bool(false)
+Checking OK
+bool(true)
+object(stdClass)#%d (%d) {
+  [%sname"]=>
+  string(%d) "{%s}%s"
+  [%sattributes"]=>
+  int(%d)
+  [%sdelimiter"]=>
+  string(%d) "%s"
+}
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt
new file mode 100644
index 0000000..b772476
--- /dev/null
+++ b/ext/imap/tests/imap_headerinfo_basic.phpt
@@ -0,0 +1,129 @@
+--TEST--
+imap_headerinfo() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = setup_test_mailbox('', 1);
+
+$z = imap_headerinfo($stream_id, 1);
+
+$fields = array ('toaddress','to','fromaddress','from',
+'reply_toaddress','reply_to',
+	'senderaddress', 'sender', 
+'subject','Subject',
+	'Recent','Unseen','Flagged','Answered','Deleted','Draft',
+	'Msgno','MailDate','Size','udate');
+
+echo "Check general fields\n";
+foreach ($fields as $key) {
+	var_dump(isset($z->$key));
+}
+
+echo "Check type\n";
+var_dump($z->toaddress);
+var_dump($z->fromaddress);
+var_dump($z->reply_toaddress);
+var_dump($z->senderaddress);
+var_dump($z->subject);
+var_dump($z->Subject);
+
+if ($z->Recent == 'R' || $z->Recent == 'N' || $z->Recent == ' ') {
+	echo "Recent: OK";
+} else {
+	echo "Recent: error: ".$z->Recent;
+}
+echo "\n";
+
+if ($z->Unseen == 'U' || $z->Unseen == ' ') {
+	echo "Unseen: OK";
+} else {
+	echo "Unseen: error: ".$z->Unseen;
+}
+echo "\n";
+
+if ($z->Flagged == 'F' || $z->Flagged == ' ') {
+	echo "Flagged: OK";
+} else {
+	echo "Flagged: error: ".$z->Flagged;
+}
+echo "\n";
+
+if ($z->Answered == 'A' || $z->Answered == ' ') {
+	echo "Answered: OK";
+} else {
+	echo "Answered: error";
+}
+echo "\n";
+
+if ($z->Deleted == 'D' || $z->Deleted == ' ') {
+	echo "Deleted: OK";
+} else {
+	echo "Deleted: error";
+}
+echo "\n";
+
+if ($z->Draft == 'X' || $z->Draft == ' ') {
+	echo "Draft: OK";
+} else {
+	echo "Draft: error";
+}
+echo "\n";
+
+var_dump($z->Msgno);
+var_dump($z->Size);
+var_dump($z->udate);
+
+imap_close($stream_id);
+
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+Check general fields
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Check type
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+Recent: OK
+Unseen: OK
+Flagged: OK
+Answered: OK
+Deleted: OK
+Draft: OK
+string(%d) "%s"
+string(%d) "%d"
+int(%d)
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_headerinfo_error.phpt b/ext/imap/tests/imap_headerinfo_error.phpt
new file mode 100644
index 0000000..b526096
--- /dev/null
+++ b/ext/imap/tests/imap_headerinfo_error.phpt
@@ -0,0 +1,36 @@
+--TEST--
+imap_headerinfo() incorrect parameter count
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_headerinfo();
+
+echo  "Checking with incorrect parameter type\n";
+imap_headerinfo('');
+imap_headerinfo(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+	
+imap_headerinfo($stream_id);
+
+imap_close($stream_id);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_headerinfo() expects at least 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_headerinfo() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_headerinfo() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_headerinfo() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
new file mode 100644
index 0000000..93c51f9
--- /dev/null
+++ b/ext/imap/tests/imap_headers.phpt
@@ -0,0 +1,28 @@
+--TEST--
+imap_headers() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_headers();
+
+echo  "Checking with incorrect parameter type\n";
+imap_headers('');
+imap_headers(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_headers() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_headers() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_headers() expects parameter 1 to be resource, boolean given in %s on line %d
+
diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc
new file mode 100644
index 0000000..ed36239
--- /dev/null
+++ b/ext/imap/tests/imap_include.inc
@@ -0,0 +1,196 @@
+<?php
+// Change these to make tests run successfully
+$server   = '{localhost/norsh}';
+$default_mailbox = $server . "INBOX";
+$domain = "something.com";
+$admin_user = "webmaster"; // a user with admin access 
+$username = "$admin_user@$domain";
+$password = 'p4ssw0rd';
+$users = array("webmaster", "info", "admin", "foo"); // tests require 4 valid userids
+$mailbox_prefix = "phpttest"; // name used for test mailbox
+
+// record test start time (used by displayOverviewFields())
+$start_time = time();
+
+// list of fields to expect
+$mandatory_overview_fields = array(
+                    'size',
+                    'uid',
+                    'msgno',
+                    'recent',
+                    'flagged',
+                    'answered',
+                    'deleted',
+                    'seen',
+                    'draft',
+                    'udate',
+                   );
+
+/**
+ * Display all fields in an element from an imap_fetch_overview() response
+ *
+ * Special handling for 'udate', which will vary run-to-run; assumes an IMAP
+ * server with its clock synced to the current system, which is consistent with
+ * setup instructions in ext/imap/tests/README
+ *
+ * @param array resp element from the return value of imap_fetch_overview()
+ */
+function displayOverviewFields($resp, $fields=null) {
+  global $mandatory_overview_fields;
+  global $start_time;
+
+  foreach ($fields ? $fields : $mandatory_overview_fields as $mf)
+  {
+    $z = $resp->$mf;
+    if ($mf == 'udate') {
+      if (($z >= $start_time) && ($z <= time())) {
+        echo "$mf is OK\n";
+      } else {
+        echo "$mf is BAD ($z)\n";
+      }
+    } else {
+      echo "$mf is $z\n";
+    }
+  }
+}
+
+
+/**
+ * Create a test mailbox and populate with msgs 
+ *
+ * @param string mailbox_suffix Suffix used to uniquely identify mailboxes
+ * @param int message_count number of test msgs to be written to new mailbox 
+ * 
+ * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ */
+function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
+	global $server, $default_mailbox, $username, $password;
+	
+	// open a stream to default mailbox
+	$imap_stream = imap_open($default_mailbox, $username, $password);
+
+	if ($imap_stream === false) {
+		echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
+		return false;
+	}	
+	
+	echo "Create a temporary mailbox and add " . $message_count .  " msgs\n";
+	$new_mailbox = create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type);
+	if ($new_mailbox === false) {
+	   echo "Cant create a temporary mailbox: " . imap_last_error(). "\n";
+	   return false;
+	}
+	
+	echo ".. mailbox '$new_mailbox' created\n";
+	
+	// reopen stream to new mailbox
+	if (imap_reopen($imap_stream, $new_mailbox) === false) {
+		echo "cant re-open '$new_mailbox' mailbox: " . imap_last_error() . "\n";
+		return false;
+	}
+	
+	return $imap_stream;
+}
+
+/**
+ * Create mailbox and fill with generic emails
+ *
+ * @param resource $imap_stream
+ * @param string $mailbox
+ */
+function create_mailbox($imap_stream, $mailbox_suffix, $message_count, $msg_type= "simple"){
+	global $default_mailbox, $mailbox_prefix;
+	$mailbox = $default_mailbox . "." . $mailbox_prefix . $mailbox_suffix;
+	
+	$mailboxes = imap_getmailboxes($imap_stream, $mailbox, '*');
+	
+	// check mailbox does not already exist
+	if ($mailboxes) {
+		foreach($mailboxes as $value) {
+			if ($value->name == $mailbox) {
+				exit ("TEST FAILED : Mailbox '$mailbox' already exists\n");
+			}
+		}
+	}	
+
+	if (imap_createmailbox($imap_stream, $mailbox) === false) {
+		return false;
+	}
+	
+	// Add number of test msgs requested
+	if ($message_count > 0) {
+		populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type);
+	}	
+	
+	return $mailbox;
+}
+
+/**
+ * Populate a mailbox with generic emails
+ *
+ * @param resource $imap_stream
+ * @param string $mailbox
+ */
+function populate_mailbox($imap_stream, $mailbox, $message_count, $msg_type = "simple"){
+
+	global $users, $domain;
+
+	for($i = 1; $i <= $message_count; $i++) {
+		if ($msg_type == "simple") {
+			$msg =  "From: foo@anywhere.com\r\n"
+				. "To: $users[0]@$domain\r\n"
+				. "Subject: test$i\r\n"
+				. "\r\n"
+				. "$i: this is a test message, please ignore\r\n";
+		} else {
+			$envelope["from"]= "foo@anywhere.com";
+			$envelope["to"]  = "$users[0]@$domain";
+			$envelope["subject"] = "Test msg $i";
+		
+			$part1["type"] = TYPEMULTIPART;
+			$part1["subtype"] = "mixed";
+			
+			$part2["type"] = TYPETEXT;
+			$part2["subtype"] = "plain";
+			$part2["description"] = "imap_mail_compose() function";
+			$part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx";
+			
+			$part3["type"] = TYPETEXT;
+			$part3["subtype"] = "plain";
+			$part3["description"] = "Example";
+			$part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy";
+			
+			$part4["type"] = TYPETEXT;
+			$part4["subtype"] = "plain";
+			$part4["description"] = "Return Values";
+			$part4["contents.data"] = "message 3:zzzzzzzzzzzzzzzzzzzzzzzzzz";
+			
+			$body[1] = $part1;
+			$body[2] = $part2;
+			$body[3] = $part3;
+			$body[4] = $part4;
+			
+			$msg = imap_mail_compose($envelope, $body);
+		}
+	
+		imap_append($imap_stream, $mailbox, $msg);
+	}
+}
+
+/**
+ * Get the mailbox name from a mailbox decription, i.e strip off server details.  
+ *
+ * @param string mailbox complete mailbox name 
+ * @return mailbox name 
+ */
+function get_mailbox_name($mailbox){
+
+	if (preg_match('/\{.*?\}(.*)/', $mailbox, $match) != 1) {
+		echo "Unrecpognized mailbox name\n";
+		return false;
+	}
+
+	return $match[1];
+}
+
+?>
diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt
new file mode 100644
index 0000000..36f07f7
--- /dev/null
+++ b/ext/imap/tests/imap_list_basic.phpt
@@ -0,0 +1,47 @@
+--TEST--
+imap_list() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_list();
+
+echo  "Checking with incorrect parameter type\n";
+imap_list('');
+imap_list(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+
+imap_list($stream_id);
+imap_list($stream_id,$default_mailbox);
+imap_list($stream_id,$default_mailbox,'ezerz');
+
+
+$z = imap_list($stream_id,$default_mailbox,'*');
+var_dump(is_array($z));
+var_dump($z[0]);
+
+imap_close($stream_id);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_list() expects exactly 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_list() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_list() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_list() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_list() expects exactly 3 parameters, 2 given in %s on line %d
+bool(true)
+string(%s) "{%s}%s"
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt
new file mode 100644
index 0000000..153ca2a
--- /dev/null
+++ b/ext/imap/tests/imap_lsub_basic.phpt
@@ -0,0 +1,61 @@
+--TEST--
+imap_lsub() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_lsub();
+
+echo  "Checking with incorrect parameter type\n";
+imap_lsub('');
+imap_lsub(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+
+imap_lsub($stream_id);
+imap_lsub($stream_id,$default_mailbox);
+var_dump(imap_lsub($stream_id,$default_mailbox,'ezDvfXvbvcxSerz'));
+
+
+echo "Checking OK\n";
+
+$newbox = $default_mailbox . "." . $mailbox_prefix;
+
+imap_createmailbox($stream_id, $newbox);
+imap_subscribe($stream_id, $newbox);
+
+$z = imap_lsub($stream_id,$default_mailbox,'*');
+
+var_dump(is_array($z));
+var_dump($z[0]);
+
+imap_close($stream_id);
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_lsub() expects exactly 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_lsub() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_lsub() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_lsub() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_lsub() expects exactly 3 parameters, 2 given in %s on line %d
+bool(false)
+Checking OK
+bool(true)
+string(%s) "{%s}%s"
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt
new file mode 100644
index 0000000..47c5e61
--- /dev/null
+++ b/ext/imap/tests/imap_mail_copy.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Test imap_mail_copy() incorrect parameters
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_mail_copy();
+
+
+echo  "Checking with incorrect parameter type\n";
+imap_mail_copy('');
+imap_mail_copy(false);
+
+
+// more tests
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+
+echo "Test with IMAP server\n";
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+	
+var_dump(imap_mail_copy($stream_id));
+var_dump(imap_mail_copy($stream_id,-1));
+var_dump(imap_mail_copy($stream_id, ''));
+
+imap_close($stream_id);
+?>
+===Done===
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_mail_copy() expects at least 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_mail_copy() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_mail_copy() expects at least 3 parameters, 1 given in %s on line %d
+Test with IMAP server
+
+Warning: imap_mail_copy() expects at least 3 parameters, 1 given in %s on line %d
+NULL
+
+Warning: imap_mail_copy() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+
+Warning: imap_mail_copy() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+===Done===
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt
new file mode 100644
index 0000000..a7b9421
--- /dev/null
+++ b/ext/imap/tests/imap_mail_copy_basic.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Test imap_mail_copy() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_mail_copy  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
+ * Description: Copies mail messages specified by msglist  to specified mailbox. 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_mail_copy() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+
+echo "Create a new mailbox for test\n";
+$imap_stream = setup_test_mailbox("", 1);
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$check = imap_check($imap_stream);
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+
+var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
+
+imap_close($imap_stream);
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_mail_copy() : basic functionality ***
+Create a new mailbox for test
+Create a temporary mailbox and add 1 msgs
+.. mailbox '%s' created
+Msg Count in new mailbox: 1
+bool(true)
+===Done===
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt
new file mode 100644
index 0000000..67ddea7
--- /dev/null
+++ b/ext/imap/tests/imap_mail_move.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Test imap_mail_move() incorrect parameters
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_mail_move();
+
+
+echo  "Checking with incorrect parameter type\n";
+imap_mail_move('');
+imap_mail_move(false);
+
+
+// more tests
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+
+echo "Test with IMAP server\n";
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+	
+var_dump(imap_mail_move($stream_id));
+var_dump(imap_mail_move($stream_id,-1));
+var_dump(imap_mail_move($stream_id, ''));
+
+imap_close($stream_id);
+?>
+===Done===
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_mail_move() expects at least 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_mail_move() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_mail_move() expects at least 3 parameters, 1 given in %s on line %d
+Test with IMAP server
+
+Warning: imap_mail_move() expects at least 3 parameters, 1 given in %s on line %d
+NULL
+
+Warning: imap_mail_move() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+
+Warning: imap_mail_move() expects at least 3 parameters, 2 given in %s on line %d
+NULL
+===Done===
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
new file mode 100644
index 0000000..a543582
--- /dev/null
+++ b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Test imap_mail_move() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+/* Prototype  : bool imap_mail_move  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
+ * Description: Copies mail messages specified by msglist  to specified mailbox. 
+ * Source code: ext/imap/php_imap.c
+ */
+
+echo "*** Testing imap_mail_move() : basic functionality ***\n";
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+
+
+echo "Create a new mailbox for test\n";
+$imap_stream = setup_test_mailbox("", 1);
+if (!is_resource($imap_stream)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$check = imap_check($imap_stream);
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+
+var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
+
+imap_close($imap_stream);
+?>
+===Done===
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+*** Testing imap_mail_move() : basic functionality ***
+Create a new mailbox for test
+Create a temporary mailbox and add 1 msgs
+.. mailbox '%s' created
+Msg Count in new mailbox: 1
+bool(true)
+===Done===
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
new file mode 100644
index 0000000..7a1a54a
--- /dev/null
+++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt
@@ -0,0 +1,23 @@
+--TEST--
+imap_mutf7_to_utf8
+--SKIPIF--
+<?php if (!extension_loaded("imap")) print "skip"; ?>
+<?php if (!function_exists("imap_mutf7_to_utf8")) print "skip"; ?>
+--FILE--
+<?php
+
+var_dump(imap_mutf7_to_utf8(""));
+var_dump(imap_mutf7_to_utf8(1));
+var_dump(imap_mutf7_to_utf8(array(1,2)));
+var_dump(imap_mutf7_to_utf8("t&AOQ-st"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(0) ""
+string(1) "1"
+
+Warning: imap_mutf7_to_utf8() expects parameter 1 to be string, array given in %s on line %d
+NULL
+string(5) "täst"
+Done
diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt
new file mode 100644
index 0000000..6c4f50e
--- /dev/null
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -0,0 +1,28 @@
+--TEST--
+imap_num_msg() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_num_msg();
+
+echo  "Checking with incorrect parameter type\n";
+imap_num_msg('');
+imap_num_msg(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_num_msg() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_num_msg() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_num_msg() expects parameter 1 to be resource, boolean given in %s on line %d
+
diff --git a/ext/imap/tests/imap_num_recent_error.phpt b/ext/imap/tests/imap_num_recent_error.phpt
new file mode 100644
index 0000000..e723473
--- /dev/null
+++ b/ext/imap/tests/imap_num_recent_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_expunge() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_expunge();
+
+echo  "Checking with incorrect parameter type\n";
+imap_expunge('');
+imap_expunge(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_expunge() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_expunge() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_expunge() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_open_error.phpt b/ext/imap/tests/imap_open_error.phpt
new file mode 100644
index 0000000..83b0eba
--- /dev/null
+++ b/ext/imap/tests/imap_open_error.phpt
@@ -0,0 +1,47 @@
+--TEST--
+imap_open() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_open();
+imap_open(false);
+imap_open(false, false);
+imap_open('');
+imap_open('', '');
+
+echo "Checking with incorrect parameters\n" ;
+imap_open('', '', '');
+imap_open('', '', '', -1);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+imap_open($default_mailbox, $username, $password, NIL, -1);
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_open() expects at least 3 parameters, 0 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 2 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 2 given in %s on line %d
+Checking with incorrect parameters
+
+Warning: imap_open(): Couldn't open stream  in %s on line %d
+
+Warning: imap_open(): Couldn't open stream  in %s on line %d
+
+Warning: imap_open(): Retries must be greater or equal to 0 in %s on line %d
+
+Notice: Unknown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0
diff --git a/ext/imap/tests/imap_ping_error.phpt b/ext/imap/tests/imap_ping_error.phpt
new file mode 100644
index 0000000..7c87867
--- /dev/null
+++ b/ext/imap/tests/imap_ping_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_ping() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_ping();
+
+echo  "Checking with incorrect parameter type\n";
+imap_ping('');
+imap_ping(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_ping() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_ping() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_ping() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt
new file mode 100644
index 0000000..b445f1d
--- /dev/null
+++ b/ext/imap/tests/imap_renamemailbox_basic.phpt
@@ -0,0 +1,66 @@
+--TEST--
+imap_renamemailbox() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_renamemailbox();
+
+echo  "Checking with incorrect parameter type\n";
+imap_renamemailbox('');
+imap_renamemailbox(false);
+
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+	
+$stream_id = setup_test_mailbox('', 1);
+
+if (!is_resource($stream_id)) {
+	exit("TEST FAILED: Unable to create test mailbox\n");
+}
+
+$newbox = $default_mailbox . "." . $mailbox_prefix;
+
+imap_renamemailbox($stream_id, $newbox.'not');
+imap_renamemailbox($stream_id, $newbox);
+
+//commented because of bug #49901
+//$ancError = error_reporting(0);
+//$z = imap_renamemailbox($stream_id, $newbox.'not2', $newbox.'2');
+//var_dump($z);
+//error_reporting($ancError);
+echo "Checking OK\n";
+
+
+var_dump(imap_createmailbox($stream_id, $newbox.'.test'));
+var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd'));
+
+imap_close($stream_id);
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_renamemailbox() expects exactly 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_renamemailbox() expects exactly 3 parameters, 1 given in %s on line %d
+
+Warning: imap_renamemailbox() expects exactly 3 parameters, 1 given in %s on line %d
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Warning: imap_renamemailbox() expects exactly 3 parameters, 2 given in %s on line %d
+
+Warning: imap_renamemailbox() expects exactly 3 parameters, 2 given in %s on line %d
+Checking OK
+bool(true)
+bool(true)
diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
new file mode 100644
index 0000000..e425392
--- /dev/null
+++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
@@ -0,0 +1,122 @@
+--TEST--
+imap_rfc822_parse_headers() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = setup_test_mailbox('', 1);
+
+$z = imap_headerinfo($stream_id, 1);
+
+$fields = array ('toaddress','to','fromaddress','from',
+'reply_toaddress','reply_to',
+	'senderaddress', 'sender', 
+'subject','Subject',
+	'MailDate','Size','udate');
+
+
+echo "Check general fields\n";
+foreach ($fields as $key) {
+	var_dump(isset($z->$key));
+}
+
+echo "Check type\n";
+var_dump($z->toaddress);
+var_dump($z->fromaddress);
+var_dump($z->reply_toaddress);
+var_dump($z->senderaddress);
+var_dump($z->subject);
+var_dump($z->Subject);
+
+if ($z->Recent == 'R' || $z->Recent == 'N' || $z->Recent == ' ') {
+	echo "Recent: OK";
+} else {
+	echo "Recent: error";
+}
+echo "\n";
+
+if ($z->Unseen == 'U' || $z->Unseen == ' ') {
+	echo "Unseen: OK";
+} else {
+	echo "Unseen: error";
+}
+echo "\n";
+
+if ($z->Flagged == 'F' || $z->Flagged == ' ') {
+	echo "Flagged: OK";
+} else {
+	echo "Flagged: error";
+}
+echo "\n";
+
+if ($z->Answered == 'A' || $z->Answered == ' ') {
+	echo "Answered: OK";
+} else {
+	echo "Answered: error";
+}
+echo "\n";
+
+if ($z->Deleted == 'D' || $z->Deleted == ' ') {
+	echo "Deleted: OK";
+} else {
+	echo "Deleted: error";
+}
+echo "\n";
+
+if ($z->Draft == 'X' || $z->Draft == ' ') {
+	echo "Draft: OK";
+} else {
+	echo "Draft: error";
+}
+echo "\n";
+
+var_dump($z->Msgno);
+var_dump($z->Size);
+var_dump($z->udate);
+
+imap_close($stream_id);
+
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+Check general fields
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Check type
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+Recent: OK
+Unseen: OK
+Flagged: OK
+Answered: OK
+Deleted: OK
+Draft: OK
+string(%d) "%s"
+string(%d) "%d"
+int(%d)
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt
new file mode 100644
index 0000000..91e6ce0
--- /dev/null
+++ b/ext/imap/tests/imap_savebody_basic.phpt
@@ -0,0 +1,61 @@
+--TEST--
+imap_savebody() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_savebody();
+
+echo  "Checking with incorrect parameter type\n";
+imap_savebody('');
+imap_savebody(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = setup_test_mailbox('', 1);
+
+imap_savebody($stream_id);
+
+$file = dirname(__FILE__).'/tmpsavebody.txt';
+
+//with URL
+$z = imap_savebody($stream_id, $file, 1);
+var_dump($z);
+echo "Size: ".filesize($file)."\n";
+
+//With FOPEN
+$fp = fopen($file, 'w');
+$z = imap_savebody($stream_id, $fp, 1);
+fclose($fp);
+var_dump($z);
+echo "Size: ".filesize($file)."\n";
+
+imap_close($stream_id);
+?>
+--CLEAN--
+<?php 
+@unlink(dirname(__FILE__).'/tmpsavebody.txt');
+require_once('clean.inc');
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_savebody() expects at least 3 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_savebody() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_savebody() expects at least 3 parameters, 1 given in %s on line %d
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+
+Warning: imap_savebody() expects at least 3 parameters, 1 given in %s on line %d
+bool(true)
+Size: %d
+bool(true)
+Size: %d
+
diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
new file mode 100644
index 0000000..c2727e5
--- /dev/null
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -0,0 +1,60 @@
+--TEST--
+imap_timeout() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_timeout();
+
+echo  "Checking with incorrect parameter type\n";
+imap_timeout('');
+imap_timeout(false);
+
+echo "GET values:\n";
+var_dump(imap_timeout(IMAP_OPENTIMEOUT));
+var_dump(imap_timeout(IMAP_READTIMEOUT));
+var_dump(imap_timeout(IMAP_WRITETIMEOUT));
+var_dump(imap_timeout(IMAP_CLOSETIMEOUT));
+
+echo "SET values:\n";
+var_dump(imap_timeout(IMAP_OPENTIMEOUT, 10));
+var_dump(imap_timeout(IMAP_READTIMEOUT, 10));
+var_dump(imap_timeout(IMAP_WRITETIMEOUT, 10));
+
+//IMAP_CLOSETIMEOUT not implemented
+//var_dump(imap_timeout(IMAP_CLOSETIMEOUT, 10));
+
+echo "CHECK values:\n";
+var_dump(imap_timeout(IMAP_OPENTIMEOUT));
+var_dump(imap_timeout(IMAP_READTIMEOUT));
+var_dump(imap_timeout(IMAP_WRITETIMEOUT));
+
+//IMAP_CLOSETIMEOUT not implemented
+//var_dump(imap_timeout(IMAP_CLOSETIMEOUT));
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_timeout() expects at least 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_timeout() expects parameter 1 to be long, %s given in %s on line %d
+GET values:
+int(%d)
+int(%d)
+int(%d)
+int(%d)
+SET values:
+bool(true)
+bool(true)
+bool(true)
+CHECK values:
+int(10)
+int(10)
+int(10)
diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt
new file mode 100644
index 0000000..4b48b1b
--- /dev/null
+++ b/ext/imap/tests/imap_undelete_basic.phpt
@@ -0,0 +1,29 @@
+--TEST--
+imap_undelete() function : basic functionality 
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = setup_test_mailbox('', 1);
+
+imap_delete($stream_id, 1);
+
+var_dump(imap_undelete($stream_id, 1));
+
+imap_close($stream_id);
+
+?>
+--CLEAN--
+<?php 
+require_once('clean.inc');
+?>
+--EXPECTF--
+Create a temporary mailbox and add 1 msgs
+.. mailbox '{%s}%s' created
+bool(true)
+\ No newline at end of file
diff --git a/ext/imap/tests/imap_undelete_error.phpt b/ext/imap/tests/imap_undelete_error.phpt
new file mode 100644
index 0000000..c82801e
--- /dev/null
+++ b/ext/imap/tests/imap_undelete_error.phpt
@@ -0,0 +1,36 @@
+--TEST--
+imap_undelete() incorrect parameter count
+--CREDITS--
+Olivier Doucet
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_undelete();
+
+echo  "Checking with incorrect parameter type\n";
+imap_undelete('');
+imap_undelete(false);
+
+require_once(dirname(__FILE__).'/imap_include.inc');
+$stream_id = imap_open($default_mailbox, $username, $password) or 
+	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
+	
+imap_undelete($stream_id);
+
+imap_close($stream_id);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_undelete() expects at least 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_undelete() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_undelete() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_undelete() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/imap/tests/imap_utf8.phpt b/ext/imap/tests/imap_utf8.phpt
new file mode 100644
index 0000000..f701f82
--- /dev/null
+++ b/ext/imap/tests/imap_utf8.phpt
@@ -0,0 +1,22 @@
+--TEST--
+imap_utf8() tests
+--SKIPIF--
+<?php if (!extension_loaded("imap")) print "skip"; ?>
+--FILE--
+<?php
+
+var_dump(imap_utf8(""));
+var_dump(imap_utf8(1));
+var_dump(imap_utf8(array(1,2)));
+var_dump(imap_utf8("test"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(0) ""
+string(1) "1"
+
+Warning: imap_utf8() expects parameter 1 to be string, array given in %s on line %d
+NULL
+string(4) "%s"
+Done
diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
new file mode 100644
index 0000000..54b43ef
--- /dev/null
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -0,0 +1,23 @@
+--TEST--
+imap_utf8_to_mutf7
+--SKIPIF--
+<?php if (!extension_loaded("imap")) print "skip imap extension not loaded"; ?>
+<?php if (!function_exists("imap_utf8_to_mutf7")) print "skip imap_utf8_to_mutf7() not available"; ?>
+--FILE--
+<?php
+
+var_dump(imap_utf8_to_mutf7(""));
+var_dump(imap_utf8_to_mutf7(1));
+var_dump(imap_utf8_to_mutf7(array(1,2)));
+var_dump(imap_utf8_to_mutf7("täst"));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(0) ""
+string(1) "1"
+
+Warning: imap_utf8_to_mutf7() expects parameter 1 to be string, array given in %s on line %d
+NULL
+string(8) "t&AOQ-st"
+Done
diff --git a/ext/imap/tests/skipif.inc b/ext/imap/tests/skipif.inc
new file mode 100644
index 0000000..47bfd08
--- /dev/null
+++ b/ext/imap/tests/skipif.inc
@@ -0,0 +1,16 @@
+<?php
+extension_loaded('imap') or die('skip imap extension not available in this build');
+ 
+// Change these to make tests run successfully
+$mailbox  = '{localhost/norsh}';
+$username = 'webmaster@something.com';
+$password = 'p4ssw0rd';
+$options = OP_HALFOPEN; // this should be enough to verify server present
+$retries = 0; // dont retry connect on failure
+
+$mbox = @imap_open($mailbox, $username, $password, $options, $retries);
+if (!$mbox) {
+	die("skip could not connect to mailbox $mailbox");
+}
+imap_close($mbox);
+?>