diff --git a/phpwf/plugins/class.yui.php b/phpwf/plugins/class.yui.php
index c2d2398e..a276877c 100644
--- a/phpwf/plugins/class.yui.php
+++ b/phpwf/plugins/class.yui.php
@@ -5275,6 +5275,25 @@ url:strUrl, success:function(html){strReturn = html;}, async:false
             )
           ";
         }
+               
+        if(isset($parameter['lieferadresse']) && !empty($parameter['lieferadresse'])) {   
+          $paramsArray[] = "
+            ( 
+              a.id IN
+              (
+                SELECT 
+                  adresse 
+                FROM 
+                  lieferadressen lfadr
+                WHERE 
+                  lfadr.name LIKE '%" . $parameter['lieferadresse'] . "%' OR
+                  lfadr.strasse LIKE '%" . $parameter['lieferadresse'] . "%' OR
+                  lfadr.plz LIKE '%" . $parameter['lieferadresse'] . "%' OR
+                  lfadr.ort LIKE '%" . $parameter['lieferadresse'] . "%'
+              )
+            )
+          ";
+        }
 
         if(isset($parameter['abteilung']) && !empty($parameter['abteilung'])) {
           $paramsArray[] = "a.abteilung LIKE '%".$parameter['abteilung']."%' ";
diff --git a/www/pages/content/adresse_table_filter.tpl b/www/pages/content/adresse_table_filter.tpl
index 28437af7..551aaecb 100644
--- a/www/pages/content/adresse_table_filter.tpl
+++ b/www/pages/content/adresse_table_filter.tpl
@@ -62,10 +62,14 @@
 							<td>{|E-Mail|}:</td>
 							<td><input type="text" name="email" value=""></td>
 						</tr>
-            <tr>
-              <td>{|Kunde hat Abo|}</td><td><input type="checkbox" name="abo" value="1" /> {|Marketingsperre|}: <input type="checkbox" name="marketingsperre" value="1" /> {|Lead|}: <input type="checkbox" name="lead" value="1" />
-              </td>
-            </tr>
+						<tr>
+							<td>{|Lieferadresse|}:</td>
+							<td><input type="text" name="lieferadresse" value=""></td>
+						</tr>
+                        <tr>
+                          <td>{|Kunde hat Abo|}</td><td><input type="checkbox" name="abo" value="1" /> {|Marketingsperre|}: <input type="checkbox" name="marketingsperre" value="1" /> {|Lead|}: <input type="checkbox" name="lead" value="1" />
+                          </td>
+                        </tr>
 					</table>
 				</div>
 
@@ -150,13 +154,15 @@
 									[ROLLEN]
 								</select>
 							</td>
-              <td>Gruppen:</td>
-              <td>
+						</tr>
+						<tr>
+                            <td>Gruppen:</td>
+                            <td>
 								<select name="gruppe">
 									<option value="">{|Alle|}</option>
 									[GRUPPEN]
 								</select>
-              </td>
+                            </td>
 						</tr>
 					</table>
 				</div>