diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index c80c527092e2..7a2c9271de78 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -1,67 +1,66 @@
 PORTNAME=	mailzu
 DISTVERSION=	0.8rc3
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	MailZu_${DISTVERSION:S/rc/RC/}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Simple and intuitive web interface to manage amavisd-new quarantine
 WWW=		https://sourceforge.net/projects/mailzu/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
 		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
 		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
 		${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
 		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=		php:flavors,web
 USE_PHP=	sockets
-IGNORE_WITH_PHP=	83
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 PLIST_SUB=	WWWGRP="${WWWGRP}" \
 		WWWOWN="${WWWOWN}"
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS IMAP LDAP
 OPTIONS_DEFAULT=	MYSQL
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL PGSQL
 
 IMAP_DESC=	Use IMAP auth backend
 LDAP_DESC=	Use LDAP auth backend
 MYSQL_DESC=	Use MySQL database storage/auth backend (default)
 PGSQL_DESC=	Use PostgreSQL database/auth storage backend
 SQL_DESC=	SQL sotage backend
 
 IMAP_USE=	PHP=imap
 LDAP_USE=	PHP=ldap
 MYSQL_USE=	PHP=mysqli
 PGSQL_USE=	PHP=pgsql
 
 PEARDIR?=	${LOCALBASE}/share/pear
 
 post-patch:
 	${INSTALL_DATA} ${FILESDIR}/pl.*.php ${WRKSRC}/lang/
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.php ${WRKSRC}/*.js ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \
 		${STAGEDIR}${WWWDIR} "! -name '*.orig'")
 	(cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/mailzu/files/patch-messagesPendingAdmin.php b/security/mailzu/files/patch-messagesPendingAdmin.php
new file mode 100644
index 000000000000..c17e1fbe9d12
--- /dev/null
+++ b/security/mailzu/files/patch-messagesPendingAdmin.php
@@ -0,0 +1,11 @@
+--- messagesPendingAdmin.php.orig	2007-06-14 19:00:15 UTC
++++ messagesPendingAdmin.php
+@@ -36,6 +36,8 @@ $_SESSION['sessionNav'] = "Site Pending Requests";
+ // Get current page number
+ $requestedPage = CmnFns::getGlobalVar('page', GET);
+ 
++global $content_type;
++
+ $db = new DBEngine();
+ 
+ $t = new Template(translate('Site Quarantine'));
diff --git a/security/mailzu/files/patch-templates_viewmail.template.php b/security/mailzu/files/patch-templates_viewmail.template.php
index 64f4c1e50b21..612560763fdc 100644
--- a/security/mailzu/files/patch-templates_viewmail.template.php
+++ b/security/mailzu/files/patch-templates_viewmail.template.php
@@ -1,80 +1,90 @@
 --- templates/viewmail.template.php.orig	2007-06-14 19:00:15 UTC
 +++ templates/viewmail.template.php
 @@ -25,7 +25,7 @@ function startMessage() {
        <table width="100%" border="0" cellspacing="0" cellpadding="0">
          <tr>
            <td class="tableTitle" style="background-color:#0F93DF;">
 -            <? echo translate('Message'); ?>
 +            <?php echo translate('Message'); ?>
            </td>
            <td class="tableTitle" style="background-color:#0F93DF;">
              <div align="right"
 @@ -34,7 +34,7 @@ function startMessage() {
            </td>
          </tr>
        </table>
 -<?
 +<?php
  }
  
  function endMessage() {
 @@ -42,7 +42,7 @@ function endMessage() {
      </td>
    </tr>
  </table>
 -<?
 +<?php
  }
  
  /**
-@@ -81,7 +81,9 @@ function MsgPrintHeader($struct,$hdr_list) {
+@@ -50,7 +50,8 @@ function endMessage() {
+ * $param The mime structure object and the specific header name
+ */
+ function MsgPrintHeader($struct,$hdr_list) {
+-	
++	global $header_value;
++
+ 	foreach ($hdr_list as $hdr) {
+ 	  $header_value = $struct->headers[strtolower($hdr)];
+ 	  if (is_array($header_value)) {
+@@ -81,7 +82,9 @@ function MsgPrintHeader($struct,$hdr_list) {
  function MsgPrintHeaderFull($struct,$hdr_list) {
         
          foreach ($hdr_list as $hdr) {
 -          $header_value = $struct->headers[strtolower($hdr)];
 +          if ( isset($struct->headers[strtolower($hdr)] ) ) {
 +              $header_value = $struct->headers[strtolower($hdr)];
 +          }
  	  if (!$header_value) continue;
            if (is_array($header_value)) {
              $value_array = $header_value;
-@@ -116,17 +118,17 @@ function MsgDisplayOptions($mail_id, $recip_email) {
+@@ -116,17 +119,17 @@ function MsgDisplayOptions($mail_id, $recip_email) {
  <table class="stdFont" width="100%">
    <tr>
      <td align="left">
 -      <a href="javascript: history.back();">&#8249;&#8249; <? echo translate('BackMessageIndex'); ?> </a>
 +      <a href="javascript: history.back();">&#8249;&#8249; <?php echo translate('BackMessageIndex'); ?> </a>
      </td>
      <td align="right">
 -      <a href="javascript: ViewOriginal('<? echo $enc_mail_id ?>','<? echo $enc_recip_email ?>');"> <? echo translate('ViewOriginal'); ?></a>
 +      <a href="javascript: ViewOriginal('<?php echo $enc_mail_id ?>','<?php echo $enc_recip_email ?>');"> <?php echo translate('ViewOriginal'); ?></a>
        |
        <a href="javascript: void(1);" onclick="showHideFullHeaders('headers');">
 -   	      <? echo translate('ToggleHeaders'); ?></a>
 +   	      <?php echo translate('ToggleHeaders'); ?></a>
       </td>
    </tr>
  </table>
 -<?
 +<?php
  }
  
  /**
-@@ -138,14 +140,14 @@ function MsgOriginalOptions() {
+@@ -138,14 +141,14 @@ function MsgOriginalOptions() {
    <table width="100%">
     <tr>
      <td class="stdFont" align="right">
 -      <a href="javascript: window.print();"> <? echo translate('Print'); ?></a>
 +      <a href="javascript: window.print();"> <?php echo translate('Print'); ?></a>
         |
 -      <a href="javascript: window.close();"> <? echo translate('CloseWindow'); ?> </a>
 +      <a href="javascript: window.close();"> <?php echo translate('CloseWindow'); ?> </a>
      </td>
     </tr>
      <tr>
       <td class="stdFont" bgcolor="#FAFAFA">
 -<?
 +<?php
  }