diff -aur orig/email_autoresponder.php /var/www/confixx/html/user/email_autoresponder.php
--- orig/email_autoresponder.php	2006-07-01 15:16:25.000000000 +0200
+++ /var/www/confixx/html/user/email_autoresponder.php	2006-07-01 15:14:03.000000000 +0200
@@ -34,7 +34,7 @@
 $werte = db_fetch_array($id);
 $autoresponder = $werte["autoresponder"];
 
-$id3 = safe_query( "select kunde from email where kunde = ? ", TRUE, new SQLString( $PHP_AUTH_USER ) );
+$id3 = safe_query( "select kunde from email where kunde = ? and prefix!='*'", TRUE, new SQLString( $PHP_AUTH_USER ) );
 $anzahlemailadressen = db_num_rows($id3);
 
 /* -------------------- HTML -------------------- */
@@ -54,6 +54,8 @@
 	}
 	$id = safe_query( "select prefix, domain, ident from email where kunde = ?  order by prefix, domain", TRUE, new SQLString( $PHP_AUTH_USER ) );
 	while ($werte = db_fetch_array($id)) {
+		if ($werte["prefix"] == "*")
+		  continue;
 		$emailadresse = $werte["prefix"]."@".$werte["domain"];
 		$ident = $werte["ident"];
 		if (ereg("\[".$ident."\]", $autoresponderliste)) {
@@ -73,4 +75,4 @@
 /* -------------------- end HTML -------------------- */
 
 db_close();
-?>
\ No newline at end of file
+?>
diff -aur orig/email_email_anlegen2.php /var/www/confixx/html/user/email_email_anlegen2.php
--- orig/email_email_anlegen2.php	2006-07-01 16:05:25.000000000 +0200
+++ /var/www/confixx/html/user/email_email_anlegen2.php	2006-07-01 16:43:50.000000000 +0200
@@ -80,6 +80,14 @@
 }
 ## //
 
+if ($prefix == "*") {
+	$fehlertext = "CatchAll accounts can't be forwarded. - CatchAll-Konten können nicht weitergeleitet werden.";
+	db_close();
+	popPathBar();
+	include( "email_email.php" );
+	exit();
+}
+
 ## prefix auf syntax pr�fen
 if ($prefix != "*") {
 	if ((!ereg("^[a-z0-9]",$prefix)) || (!ereg("[a-z0-9]$", $prefix)) || (ereg("([^a-z0-9_.-])|([.]{2})", $prefix))) {
diff -aur orig/email_email_bearbeiten.php /var/www/confixx/html/user/email_email_bearbeiten.php
--- orig/email_email_bearbeiten.php	2006-07-01 16:41:35.000000000 +0200
+++ /var/www/confixx/html/user/email_email_bearbeiten.php	2006-07-01 16:40:55.000000000 +0200
@@ -136,15 +136,17 @@
 $mainrec_header->SetColSpan("2");
 $data->AppendHeaderRow( $mainrec_header );
 
-$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
-																				$htyp,
-																				"htyp",
-																				cc_RadioGroupPresentation
-																				), 
-									new TextDataField( $htyp==1?$hpop3:"", 
-																		 "hemail" 
-																		 ) 
-									);
+if (substr($emailadresse, 0, 1) != "*") {
+	$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
+																					$htyp,
+																					"htyp",
+																					cc_RadioGroupPresentation
+																					), 
+										new TextDataField( $htyp==1?$hpop3:"", 
+																			 "hemail" 
+																			 ) 
+										);
+}
 
 for ($pops = 0; $pops < count($allpops); $pops++) {
 	 $account = $allpops[$pops];
@@ -172,15 +174,17 @@
 	$recipient_header->SetColSpan("2");
 	$data->AppendHeaderRow( $recipient_header );
 
-	$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
-																					$typs[$i],
-																					'typs['.$i.']', /* name */
-																					cc_RadioGroupPresentation 
-																					), 
-										new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
-																			 'emails['.$i.']' /* name */
-																			 ) 
-										);
+	if (substr($emailadresse, 0, 1) != "*") {
+		$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
+																						$typs[$i],
+																						'typs['.$i.']', /* name */
+																						cc_RadioGroupPresentation 
+																						), 
+											new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
+																				 'emails['.$i.']' /* name */
+																				 ) 
+											);
+	}
 
 
 	$data->AppendRow( new OptionsDataField( array( "0" => ltext("emembe_cell_save")),
@@ -202,4 +206,4 @@
 /* -------------------- end HTML -------------------- */
 
 db_close();
-?>
\ No newline at end of file
+?>