upgrade to openwebmail 2.32

mail/openwebmail/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2004/03/04 06:34:09 kevlo Exp $
+# $OpenBSD: Makefile,v 1.20 2004/07/12 05:54:51 kevlo Exp $
 
 COMMENT=	"highly configurable webmail client"
 
-DISTNAME=	openwebmail-2.30
+DISTNAME=	openwebmail-2.32
 CATEGORIES=	mail www
 
 HOMEPAGE=	http://www.openwebmail.org/
@@ -14,8 +14,8 @@ PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=	http://turtle.ee.ncku.edu.tw/openwebmail/download/ \
-		ftp://openwebmail.org/pub/ \
+MASTER_SITES=	${HOMEPAGE}/openwebmail/download/ \
+		http://turtle.ee.ncku.edu.tw/openwebmail/download/ \
 		http://turtle.ee.ncku.edu.tw/openwebmail/download/old/
 EXTRACT_SUFX=	.tgz
 

mail/openwebmail/distinfo

@@ -1,3 +1,3 @@
-MD5 (openwebmail-2.30.tgz) = 585a19c3192065be279f22c947a48e83
-RMD160 (openwebmail-2.30.tgz) = 4d53242a21b5876a5df1ce8e047082f153e33d91
-SHA1 (openwebmail-2.30.tgz) = 1a3a22a8dfeb22bb37117d417f17c8d5301a3989
+MD5 (openwebmail-2.32.tgz) = 76eb967e492c81a0db56a053d221e5d4
+RMD160 (openwebmail-2.32.tgz) = de8cc7a0c507bf2af7d4cacc687033e3f782da09
+SHA1 (openwebmail-2.32.tgz) = b376e4764d838cc4199b19e91f281b11837a8879

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-abook_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-abook.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-abook.pl	Thu Mar  4 11:13:30 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-abook_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-abook.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-abook.pl	Mon Jul 12 10:51:17 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-abook.pl - address book program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-advsearch_pl

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-advsearch.pl	Thu Mar  4 11:37:00 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-advsearch.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-advsearch.pl	Mon Jul 12 10:52:11 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-adsearch.pl - advanced search program
  #
@@ -11,12 +11,12 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-advsearch_pl,v 1.4 2004/03/04 06
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-cal_pl

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-cal.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-cal.pl	Thu Mar  4 11:37:48 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-cal.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-cal.pl	Mon Jul 12 10:53:08 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-cal.pl - calendar program
  #
@@ -11,12 +11,12 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-cal_pl,v 1.3 2004/03/04 06:34:11
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(.*?)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^([^\s]*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-folder_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-folder.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-folder.pl	Thu Mar  4 11:38:25 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-folder_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-folder.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-folder.pl	Mon Jul 12 10:53:48 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-folder.pl - mail folder management program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-main_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-main.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-main.pl	Thu Mar  4 11:39:02 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-main_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-main.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-main.pl	Mon Jul 12 10:54:24 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-main.pl - message list browing program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-prefs_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-prefs.pl.orig	Thu Mar  4 12:50:00 2004
-+++ cgi-bin/openwebmail/openwebmail-prefs.pl	Thu Mar  4 12:50:38 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-prefs_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-prefs.pl.orig	Mon Jul 12 11:03:22 2004
++++ cgi-bin/openwebmail/openwebmail-prefs.pl	Mon Jul 12 11:03:49 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-prefs.pl - preference configuration, book editing program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-read_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-read.pl.orig	Thu Mar  4 12:33:40 2004
-+++ cgi-bin/openwebmail/openwebmail-read.pl	Thu Mar  4 12:34:32 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-read_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-read.pl.orig	Mon Jul 12 11:00:19 2004
++++ cgi-bin/openwebmail/openwebmail-read.pl	Mon Jul 12 11:01:15 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-read.pl - message reading program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-send_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-send.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-send.pl	Thu Mar  4 11:40:02 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-send_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-send.pl.orig	Mon Jul 12 11:42:56 2004
++++ cgi-bin/openwebmail/openwebmail-send.pl	Mon Jul 12 11:43:37 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-send.pl - mail composing and sending program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-spell_pl

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-spell.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-spell.pl	Thu Mar  4 11:41:00 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-spell.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-spell.pl	Mon Jul 12 10:32:57 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-spell.pl - spell check program
  #
@@ -11,12 +11,12 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-spell_pl,v 1.4 2004/03/04 06:34:
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-tool_pl

@@ -1,6 +1,6 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-tool.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-tool.pl	Thu Mar  4 11:45:57 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.7 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-tool.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-tool.pl	Mon Jul 12 10:38:54 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
 +#!/usr/bin/perl
@@ -11,25 +11,26 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
  #
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
- if (!$SCRIPT_DIR) {
+ if ($SCRIPT_DIR eq '') {
     print qq|\nOpen WebMail is unable to locate itself on this system,\n|.
           qq|please put 'the path of openwebmail CGI directory' to\n|.
 -         qq|the first line of file /etc/openwebmail_path.conf\n\n|.
 +         qq|the first line of file %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf\n\n|.
           qq|For example, if the script is\n\n|.
 -         qq|/usr/local/www/cgi-bin/openwebmail/openwebmail-tool.pl,\n\n|.
-+         qq|/var/www/cgi-bin/openwebmail/openwebmail-tool.pl,\n\n|.
-          qq|then the content of /etc/openwebmail_path.conf should be:\n\n|.
+-         qq|then the content of /etc/openwebmail_path.conf should be:\n\n|.
 -         qq|/usr/local/www/cgi-bin/openwebmail/\n\n|;
++         qq|/var/www/cgi-bin/openwebmail/openwebmail-tool.pl,\n\n|.
++         qq|then the content of %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf should be:\n\n|.
 +         qq|/var/www/cgi-bin/openwebmail/\n\n|;
     exit 0;
  }
  push (@INC, $SCRIPT_DIR);
-@@ -307,10 +307,10 @@
+@@ -306,10 +306,10 @@
     my $err=0;
     print "\n";
  
@@ -44,7 +45,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
     }
  
     $logindomain=$default_logindomain||ow::tool::hostname();
-@@ -469,7 +469,7 @@
+@@ -409,7 +409,7 @@
     }
  
     if ($in_init && $err) {
@@ -53,7 +54,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
              qq|dbm_ext         \t$str{conf_dbm_ext}\n|.
              qq|dbmopen_ext     \t$str{conf_dbmopen_ext}\n|.
              qq|dbmopen_haslock \t$str{conf_dbmopen_haslock}\n|.
-@@ -479,7 +479,7 @@
+@@ -419,7 +419,7 @@
              qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
     }
     if (!$in_init) {
@@ -62,16 +63,16 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
              qq|dbm_ext         \t$str{dbm_ext}\n|.
              qq|dbmopen_ext     \t$str{dbmopen_ext}\n|.
              qq|dbmopen_haslock \t$str{dbmopen_haslock}\n\n\n|;
-@@ -496,7 +496,7 @@
+@@ -436,7 +436,7 @@
     $>=0;
     if ($>!=0) {
        print qq|Your system didn't have saved suid support,\n|.
--            qq|please set the following option in $SCRIPT_DIR/etc/openwebmail.conf\n\n|.
-+            qq|please set the following option in %%SYSCONFDIR%%/openwebmail/openwebmail.conf\n\n|.
+-            qq|please set the following option in $SCRIPT_DIR/etc/suid.conf\n\n|.
++            qq|please set the following option in %%SYSCONFDIR%%/openwebmail/suid.conf\n\n|.
              qq|\thas_savedsuid_support no\n\n\n|;
        return -1;
     }
-@@ -580,10 +580,10 @@
+@@ -520,10 +520,10 @@
     my $loaded_domain=0;
     my %userhash=();
  
@@ -86,7 +87,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
     }
  
     # trap this once now.  Let usertool() test it at the domain level later
-@@ -615,10 +615,10 @@
+@@ -555,10 +555,10 @@
  
     foreach $logindomain (@domains) {
        %config_raw=();
@@ -101,7 +102,7 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-tool_pl,v 1.6 2004/03/04 06:34:1
        }
  
        if ( -f "$config{'ow_sitesconfdir'}/$logindomain") {
-@@ -690,16 +690,16 @@
+@@ -630,16 +630,16 @@
        $>=$euid_to_use;
  
        %config_raw=();

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-vdomain_pl

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-vdomain.pl	Thu Mar  4 11:46:36 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-vdomain.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-vdomain.pl	Mon Jul 12 10:40:12 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-vdomain.pl - virtual domain user management
  #
@@ -11,12 +11,12 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-vdomain_pl,v 1.3 2004/03/04 06:3
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-viewatt_pl

@@ -1,22 +1,21 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.4 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-viewatt.pl	Thu Mar  4 11:47:31 2004
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-viewatt_pl,v 1.5 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-viewatt.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-viewatt.pl	Mon Jul 12 10:41:12 2004
+@@ -1,14 +1,14 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-viewatt.pl - attachment reading program
  #
-@@ -5,10 +5,10 @@
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail-webdisk_pl

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.3 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail-webdisk.pl	Thu Mar  4 11:48:22 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.4 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail-webdisk.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail-webdisk.pl	Mon Jul 12 10:42:25 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
-+#!/usr/bin/perl -T
++#!/usr/bin/perl
  #
  # openwebmail-webdisk.pl - web disk program
  #
@@ -11,12 +11,12 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail-webdisk_pl,v 1.3 2004/03/04 06:3
  
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail//openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV

mail/openwebmail/patches/patch-cgi-bin_openwebmail_openwebmail_pl

@@ -1,6 +1,6 @@
-$OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.6 2004/03/04 06:34:11 kevlo Exp $
---- cgi-bin/openwebmail/openwebmail.pl.orig	Sat Jan  3 04:16:50 2004
-+++ cgi-bin/openwebmail/openwebmail.pl	Thu Mar  4 11:49:36 2004
+$OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.7 2004/07/12 05:54:53 kevlo Exp $
+--- cgi-bin/openwebmail/openwebmail.pl.orig	Tue May 25 17:53:48 2004
++++ cgi-bin/openwebmail/openwebmail.pl	Mon Jul 12 10:43:45 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/suidperl -T
 +#!/usr/bin/perl
@@ -11,16 +11,16 @@ $OpenBSD: patch-cgi-bin_openwebmail_openwebmail_pl,v 1.6 2004/03/04 06:34:11 kev
  #
  use vars qw($SCRIPT_DIR);
  if ( $0 =~ m!^(\S*)/[\w\d\-\.]+\.pl! ) { $SCRIPT_DIR=$1 }
--if (!$SCRIPT_DIR && open(F, '/etc/openwebmail_path.conf')) {
-+if (!$SCRIPT_DIR && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
+-if ($SCRIPT_DIR eq '' && open(F, '/etc/openwebmail_path.conf')) {
++if ($SCRIPT_DIR eq '' && open(F, '%%SYSCONFDIR%%/openwebmail/openwebmail_path.conf')) {
     $_=<F>; close(F); if ( $_=~/^(\S*)/) { $SCRIPT_DIR=$1 }
  }
--if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
-+if (!$SCRIPT_DIR) { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
+-if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in /etc/openwebmail_path.conf !\n"; exit 0; }
++if ($SCRIPT_DIR eq '') { print "Content-type: text/html\n\nSCRIPT_DIR not set in %%SYSCONFDIR%%/openwebmail/openwebmail_path.conf !\n"; exit 0; }
  push (@INC, $SCRIPT_DIR);
  
  foreach (qw(PATH ENV BASH_ENV CDPATH IFS TERM)) { $ENV{$_}='' }	# secure ENV
-@@ -60,8 +60,8 @@
+@@ -63,8 +63,8 @@
  $SIG{PIPE}=\&openwebmail_exit;	# for user stop
  $SIG{TERM}=\&openwebmail_exit;	# for user stop
  

mail/openwebmail/pkg/PLIST

@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.13 2004/04/14 14:24:35 xsa Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/07/12 05:54:55 kevlo Exp $
 cgi-bin/openwebmail/auth/README
+cgi-bin/openwebmail/auth/auth.pl
 cgi-bin/openwebmail/auth/auth_ldap.pl
+cgi-bin/openwebmail/auth/auth_ldap_vpopmail.pl
 cgi-bin/openwebmail/auth/auth_mysql.pl
 cgi-bin/openwebmail/auth/auth_mysql_vmail.pl
 cgi-bin/openwebmail/auth/auth_nis.pl
@@ -12,6 +14,7 @@ cgi-bin/openwebmail/auth/auth_unix.pl
 cgi-bin/openwebmail/auth/auth_vdomain.pl
 cgi-bin/openwebmail/modules/datetime.pl
 cgi-bin/openwebmail/modules/dbm.pl
+cgi-bin/openwebmail/modules/enriched.pl
 cgi-bin/openwebmail/modules/execute.pl
 cgi-bin/openwebmail/modules/filelock.pl
 cgi-bin/openwebmail/modules/htmlrender.pl
@@ -19,6 +22,8 @@ cgi-bin/openwebmail/modules/htmltext.pl
 cgi-bin/openwebmail/modules/lang.pl
 cgi-bin/openwebmail/modules/mailparse.pl
 cgi-bin/openwebmail/modules/mime.pl
+cgi-bin/openwebmail/modules/pop3.pl
+cgi-bin/openwebmail/modules/suid.pl
 cgi-bin/openwebmail/modules/tool.pl
 cgi-bin/openwebmail/openwebmail-abook.pl
 cgi-bin/openwebmail/openwebmail-advsearch.pl
@@ -35,6 +40,7 @@ cgi-bin/openwebmail/openwebmail-viewatt.pl
 cgi-bin/openwebmail/openwebmail-webdisk.pl
 cgi-bin/openwebmail/openwebmail.pl
 cgi-bin/openwebmail/preload.pl
+cgi-bin/openwebmail/quota/quota.pl
 cgi-bin/openwebmail/quota/quota_du.pl
 cgi-bin/openwebmail/quota/quota_unixfs.pl
 cgi-bin/openwebmail/shares/calbook.pl
@@ -49,7 +55,6 @@ cgi-bin/openwebmail/shares/maildb.pl
 cgi-bin/openwebmail/shares/mailfilter.pl
 cgi-bin/openwebmail/shares/ow-shared.pl
 cgi-bin/openwebmail/shares/pop3book.pl
-cgi-bin/openwebmail/shares/pop3mail.pl
 cgi-bin/openwebmail/shares/upgrade.pl
 cgi-bin/openwebmail/userstat.pl
 cgi-bin/openwebmail/uty/addrbook_hotmail2owm.pl
@@ -69,6 +74,7 @@ cgi-bin/openwebmail/uty/gettimeofday.pl
 cgi-bin/openwebmail/uty/htmlarea.addcharset.pl
 cgi-bin/openwebmail/uty/iconv.pl.fake
 cgi-bin/openwebmail/uty/jcode.pl
+cgi-bin/openwebmail/uty/mkcool3d.sh
 cgi-bin/openwebmail/uty/mkcool3d_en.sh
 cgi-bin/openwebmail/uty/mkcool3d_it.sh
 cgi-bin/openwebmail/uty/mkmd5list.sh
@@ -91,6 +97,7 @@ cgi-bin/openwebmail/vacation.pl
 conf/openwebmail/README.conf.default
 conf/openwebmail/address.book
 conf/openwebmail/auth_ldap.conf.default
+conf/openwebmail/auth_ldap_vpopmail.conf
 conf/openwebmail/auth_mysql.conf.default
 conf/openwebmail/auth_mysql_vmail.conf.default
 conf/openwebmail/auth_nis.conf.default
@@ -106,10 +113,13 @@ conf/openwebmail/dbm.conf.default
 conf/openwebmail/filelock.conf.default
 conf/openwebmail/filter.book
 conf/openwebmail/g2b.map
+conf/openwebmail/holidays/cs
 conf/openwebmail/holidays/de
 conf/openwebmail/holidays/de_CH
+conf/openwebmail/holidays/el
 conf/openwebmail/holidays/en
 conf/openwebmail/holidays/en_GB
+conf/openwebmail/holidays/en_HK
 conf/openwebmail/holidays/en_US
 conf/openwebmail/holidays/es
 conf/openwebmail/holidays/hu
@@ -167,6 +177,7 @@ conf/openwebmail/openwebmail.conf.default
 conf/openwebmail/openwebmail.conf.help
 conf/openwebmail/sites.conf/README
 conf/openwebmail/smtpauth.conf
+conf/openwebmail/styles/Adjunct
 conf/openwebmail/styles/BlueHue
 conf/openwebmail/styles/BoringGray
 conf/openwebmail/styles/ClassyBlue
@@ -182,6 +193,8 @@ conf/openwebmail/styles/PrettyInPink
 conf/openwebmail/styles/Redmond
 conf/openwebmail/styles/Soleil
 conf/openwebmail/styles/Violet
+conf/openwebmail/suid.conf
+conf/openwebmail/suid.conf.default
 conf/openwebmail/templates/ar.CP1256/about.template
 conf/openwebmail/templates/ar.CP1256/addressbook.template
 conf/openwebmail/templates/ar.CP1256/advsearch.template
@@ -2021,10 +2034,10 @@ htdocs/openwebmail/doc/faq.txt
 htdocs/openwebmail/doc/files.txt
 htdocs/openwebmail/doc/loginprocess.txt
 htdocs/openwebmail/doc/memory-usage.txt
-htdocs/openwebmail/doc/owmvirtual.html
+htdocs/openwebmail/doc/owmvirtual.txt
 htdocs/openwebmail/doc/quota_module.txt
+htdocs/openwebmail/doc/readme.es.txt
 htdocs/openwebmail/doc/readme.txt
-htdocs/openwebmail/doc/readme.txt.es
 htdocs/openwebmail/doc/thttpd.speedycgi.txt
 htdocs/openwebmail/help/en/def/browser.html
 htdocs/openwebmail/help/en/def/byte.html
@@ -3064,6 +3077,271 @@ htdocs/openwebmail/images/file/txt.gif
 htdocs/openwebmail/images/file/video.gif
 htdocs/openwebmail/images/file/xls.gif
 htdocs/openwebmail/images/file/zip.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/addrbook.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/addrbook.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/adduser.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/advsearch.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/attach.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/backtofolder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/blank.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/blockemail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/blockrelay.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/cal-delete.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/cal-link.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/cal-popup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/calendar.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/chpwd.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/clearaddress.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/clearst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/compose.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/dayview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/download.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/download.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/download.s.ow.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/earth.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/editdraft.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/editfroms.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/editfroms.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/editst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/editst.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/email.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/export.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/filtersetup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/first-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/first-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/first.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/first.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/folder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/follow.down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/follow.up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/forward.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/forwardasatt.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/forwardasorig.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/gotop.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/group.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/history.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/home.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/import.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/import.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/important.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/info.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/last-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/last-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/last.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/last.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/left-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/left-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/left.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/left.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/listview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/logout.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/monthview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/owm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/pop3.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/pop3setup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/prefs.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/print.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/read.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/read.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/refresh.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/reply.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/replyall.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/right-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/right-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/right.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/right.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/search.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/sound.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/sshterm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/thumbnail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/totrash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/trash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/unread.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/unread.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/vdusers.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/webdisk.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/webdisk.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/weekview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Blue/yearview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/addrbook.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/addrbook.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/addrbook_.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/adduser.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/advsearch.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/attach.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/backtofolder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/blank.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/blockemail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/blockrelay.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/cal-delete.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/cal-link.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/cal-popup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/calendar.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/chpwd.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/clearaddress.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/clearst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/compose.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/dayview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/download.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/download.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/download.s.ow.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/earth.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/editdraft.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/editfroms.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/editfroms.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/editst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/editst.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/email.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/export.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/filtersetup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/first-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/first-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/first.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/first.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/folder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/follow.down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/follow.up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/forward.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/forwardasatt.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/forwardasorig.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/gotop.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/group.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/history.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/home.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/import.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/import.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/important.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/info.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/last-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/last-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/last.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/last.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/left-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/left-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/left.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/left.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/listview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/logout.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/monthview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/owm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/pop3.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/pop3setup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/prefs.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/print.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/read.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/read.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/refresh.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/reply.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/replyall.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/right-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/right-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/right.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/right.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/search.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/sound.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/sshterm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/thumbnail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/totrash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/trash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/unread.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/unread.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/vdusers.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/webdisk.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/webdisk.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/weekview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Metal/yearview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/addrbook.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/addrbook.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/adduser.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/advsearch.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/attach.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/backtofolder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/blank.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/blockemail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/blockrelay.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/cal-delete.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/cal-link.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/cal-popup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/calendar.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/chpwd.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/clearaddress.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/clearst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/compose.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/dayview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/download.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/download.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/download.s.ow.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/earth.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/editdraft.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/editfroms.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/editfroms.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/editst.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/editst.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/email.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/export.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/filtersetup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/first-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/first-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/first.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/first.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/folder.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/follow.down.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/follow.up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/forward.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/forwardasatt.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/forwardasorig.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/gotop.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/group.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/history.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/home.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/import.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/import.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/important.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/info.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/last-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/last-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/last.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/last.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/left-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/left-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/left.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/left.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/listview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/logout.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/monthview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/owm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/pop3.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/pop3setup.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/prefs.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/print.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/read.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/read.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/refresh.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/reply.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/replyall.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/right-grey.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/right-grey.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/right.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/right.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/search.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/sound.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/sshterm.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/thumbnail.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/totrash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/trash.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/unread.a.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/unread.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/up.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/vdusers.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/webdisk.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/webdisk.s.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/weekview.gif
+htdocs/openwebmail/images/iconsets/Adjunct.Silver/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/addrbook.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/addrbook.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/adduser.gif
@@ -3148,6 +3426,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/addrbook.gif
@@ -3234,6 +3513,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Catalan/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Catalan/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Catalan/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/addrbook.gif
@@ -3321,6 +3601,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Simplified/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/addrbook.gif
@@ -3408,6 +3689,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Chinese.Traditional/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/addrbook.gif
@@ -3495,6 +3777,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Czech/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Czech/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/webmail.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Czech/yearview.gif
@@ -3582,6 +3865,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Danish/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Danish/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Danish/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Danish/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Danish/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Danish/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Danish/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/addrbook.gif
@@ -3669,6 +3953,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Deutsch/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/addrbook.gif
@@ -3756,8 +4041,96 @@ htdocs/openwebmail/images/iconsets/Cool3D.Dutch/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Dutch/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Dutch/yearview.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/addrbook.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/addrbook.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/adduser.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/advsearch.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/attach.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/backtofolder.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/blockemail.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/blockrelay.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/cal-delete.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/cal-link.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/cal-popup.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/calendar.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/chpwd.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/clearaddress.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/clearst.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/compose.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/dayview.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/down.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/download.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/download.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/download.s.ow.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/earth.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/editdraft.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/editfroms.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/editfroms.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/editst.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/editst.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/email.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/export.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/filtersetup.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/first-grey.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/first-grey.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/first.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/first.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/folder.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/follow.down.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/follow.up.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/forward.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/forwardasatt.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/forwardasorig.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/gotop.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/group.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/history.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/home.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/import.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/import.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/important.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/info.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/last-grey.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/last-grey.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/last.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/last.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/left-grey.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/left-grey.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/left.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/left.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/listview.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/logout.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/monthview.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/owm.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/pop3.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/pop3setup.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/prefs.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/print.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/read.a.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/read.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/refresh.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/reply.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/replyall.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/right-grey.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/right-grey.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/right.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/right.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/search.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/sound.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/sshterm.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/thumbnail.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/totrash.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/trash.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/unread.a.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/unread.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/up.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/vdusers.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/webdisk.s.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/weekview.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English.Large/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/addrbook.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/addrbook.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/adduser.gif
@@ -3843,6 +4216,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.English/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.English/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.English/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/addrbook.gif
@@ -3929,6 +4303,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Francais/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Francais/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Francais/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/addrbook.gif
@@ -4016,6 +4391,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hebrew/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/addrbook.gif
@@ -4102,6 +4478,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Hellenic/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/addrbook.gif
@@ -4188,6 +4565,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Italian/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Italian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Italian/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/Thumbs.db
@@ -4279,94 +4657,9 @@ htdocs/openwebmail/images/iconsets/Cool3D.Korean/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Korean/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Korean/yearview.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/addrbook.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/addrbook.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/adduser.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/advsearch.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/attach.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/backtofolder.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/blockemail.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/blockrelay.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/cal-delete.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/cal-link.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/cal-popup.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/calendar.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/chpwd.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/clearaddress.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/clearst.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/compose.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/dayview.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/down.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/download.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/download.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/download.s.ow.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/earth.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/editdraft.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/editfroms.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/editfroms.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/editst.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/editst.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/email.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/export.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/filtersetup.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/first-grey.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/first-grey.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/first.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/first.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/folder.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/follow.down.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/follow.up.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/forward.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/forwardasatt.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/forwardasorig.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/gotop.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/group.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/history.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/home.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/import.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/import.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/important.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/info.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/last-grey.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/last-grey.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/last.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/last.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/left-grey.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/left-grey.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/left.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/left.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/listview.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/logout.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/monthview.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/owm.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/pop3.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/pop3setup.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/prefs.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/print.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/read.a.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/read.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/refresh.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/reply.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/replyall.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/right-grey.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/right-grey.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/right.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/right.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/search.s.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/sound.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/sshterm.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/thumbnail.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/totrash.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/trash.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/unread.a.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/unread.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/up.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/vdusers.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/webdisk.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/weekview.gif
-htdocs/openwebmail/images/iconsets/Cool3D.Large.English/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/addrbook.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/addrbook.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/adduser.gif
@@ -4452,6 +4745,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Norwegian/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/addrbook.gif
@@ -4538,6 +4832,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Polish/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Polish/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Polish/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/addrbook.gif
@@ -4625,6 +4920,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/addrbook.gif
@@ -4711,6 +5007,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Romanian/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Romanian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Romanian/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/addrbook.gif
@@ -4798,6 +5095,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Slovak/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Slovak/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Slovak/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/addrbook.gif
@@ -4885,6 +5183,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Soumi/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Soumi/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Soumi/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/addrbook.gif
@@ -4971,6 +5270,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Spanish/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Spanish/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Spanish/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/addrbook.gif
@@ -5058,6 +5358,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Turkish/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Turkish/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Turkish/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/addrbook.gif
@@ -5145,6 +5446,7 @@ htdocs/openwebmail/images/iconsets/Cool3D.Urdu/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D.Urdu/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D.Urdu/yearview.gif
 htdocs/openwebmail/images/iconsets/Cool3D/addrbook.gif
@@ -5232,6 +5534,7 @@ htdocs/openwebmail/images/iconsets/Cool3D/unread.gif
 htdocs/openwebmail/images/iconsets/Cool3D/up.gif
 htdocs/openwebmail/images/iconsets/Cool3D/vdusers.gif
 htdocs/openwebmail/images/iconsets/Cool3D/webdisk.gif
+htdocs/openwebmail/images/iconsets/Cool3D/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Cool3D/weekview.gif
 htdocs/openwebmail/images/iconsets/Cool3D/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/addrbook.gif
@@ -5319,6 +5622,7 @@ htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/unread.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/up.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.Chinese.Traditional/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/addrbook.gif
@@ -5405,6 +5709,7 @@ htdocs/openwebmail/images/iconsets/Default.Deutsch/unread.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/up.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.Deutsch/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.Deutsch/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.English/addrbook.gif
@@ -5491,6 +5796,7 @@ htdocs/openwebmail/images/iconsets/Default.English/unread.gif
 htdocs/openwebmail/images/iconsets/Default.English/up.gif
 htdocs/openwebmail/images/iconsets/Default.English/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.English/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.English/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.English/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.English/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/addrbook.gif
@@ -5577,6 +5883,7 @@ htdocs/openwebmail/images/iconsets/Default.Norwegian/unread.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/up.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.Norwegian/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.Norwegian/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/addrbook.gif
@@ -5663,6 +5970,7 @@ htdocs/openwebmail/images/iconsets/Default.Slovak/unread.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/up.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.Slovak/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.Slovak/yearview.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/addrbook.gif
@@ -5749,6 +6057,7 @@ htdocs/openwebmail/images/iconsets/Default.Spanish/unread.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/up.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default.Spanish/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/weekview.gif
 htdocs/openwebmail/images/iconsets/Default.Spanish/yearview.gif
 htdocs/openwebmail/images/iconsets/Default/addrbook.gif
@@ -5835,6 +6144,7 @@ htdocs/openwebmail/images/iconsets/Default/unread.gif
 htdocs/openwebmail/images/iconsets/Default/up.gif
 htdocs/openwebmail/images/iconsets/Default/vdusers.gif
 htdocs/openwebmail/images/iconsets/Default/webdisk.gif
+htdocs/openwebmail/images/iconsets/Default/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/Default/weekview.gif
 htdocs/openwebmail/images/iconsets/Default/yearview.gif
 htdocs/openwebmail/images/iconsets/Text.Chinese.Simplified/cal-popup.gif
@@ -5931,6 +6241,7 @@ htdocs/openwebmail/images/iconsets/XP.Blue/unread.gif
 htdocs/openwebmail/images/iconsets/XP.Blue/up.gif
 htdocs/openwebmail/images/iconsets/XP.Blue/vdusers.gif
 htdocs/openwebmail/images/iconsets/XP.Blue/webdisk.gif
+htdocs/openwebmail/images/iconsets/XP.Blue/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/XP.Blue/weekview.gif
 htdocs/openwebmail/images/iconsets/XP.Blue/yearview.gif
 htdocs/openwebmail/images/iconsets/XP.Green/Copyright.txt
@@ -6019,6 +6330,7 @@ htdocs/openwebmail/images/iconsets/XP.Green/unread.gif
 htdocs/openwebmail/images/iconsets/XP.Green/up.gif
 htdocs/openwebmail/images/iconsets/XP.Green/vdusers.gif
 htdocs/openwebmail/images/iconsets/XP.Green/webdisk.gif
+htdocs/openwebmail/images/iconsets/XP.Green/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/XP.Green/weekview.gif
 htdocs/openwebmail/images/iconsets/XP.Green/yearview.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/Copyright.txt
@@ -6107,6 +6419,7 @@ htdocs/openwebmail/images/iconsets/XP.Purple/unread.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/up.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/vdusers.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/webdisk.gif
+htdocs/openwebmail/images/iconsets/XP.Purple/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/weekview.gif
 htdocs/openwebmail/images/iconsets/XP.Purple/yearview.gif
 htdocs/openwebmail/images/iconsets/XP.Red/Copyright.txt
@@ -6195,6 +6508,7 @@ htdocs/openwebmail/images/iconsets/XP.Red/unread.gif
 htdocs/openwebmail/images/iconsets/XP.Red/up.gif
 htdocs/openwebmail/images/iconsets/XP.Red/vdusers.gif
 htdocs/openwebmail/images/iconsets/XP.Red/webdisk.gif
+htdocs/openwebmail/images/iconsets/XP.Red/webdisk.s.gif
 htdocs/openwebmail/images/iconsets/XP.Red/weekview.gif
 htdocs/openwebmail/images/iconsets/XP.Red/yearview.gif
 htdocs/openwebmail/images/kbd.gif
@@ -6857,12 +7171,12 @@ htdocs/openwebmail/sounds/silymail.wav
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Portuguese.Brazilian
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Polish
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Norwegian
-@dirrm htdocs/openwebmail/images/iconsets/Cool3D.Large.English
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Korean
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Italian
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Hellenic
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Hebrew
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Francais
+@dirrm htdocs/openwebmail/images/iconsets/Cool3D.English.Large
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.English
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Dutch
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Deutsch
@@ -6873,6 +7187,9 @@ htdocs/openwebmail/sounds/silymail.wav
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Catalan
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D.Bulgarian
 @dirrm htdocs/openwebmail/images/iconsets/Cool3D
+@dirrm htdocs/openwebmail/images/iconsets/Adjunct.Silver
+@dirrm htdocs/openwebmail/images/iconsets/Adjunct.Metal
+@dirrm htdocs/openwebmail/images/iconsets/Adjunct.Blue
 @dirrm htdocs/openwebmail/images/iconsets
 @dirrm htdocs/openwebmail/images/file
 @dirrm htdocs/openwebmail/images/backgrounds