diff --git a/tools/module_creator/module_creator.php b/tools/module_creator/module_creator.php
index f8aba9be..13fd1c4f 100644
--- a/tools/module_creator/module_creator.php
+++ b/tools/module_creator/module_creator.php
@@ -152,7 +152,7 @@ if ($argc >= 2) {
     $php_file_contents = str_replace('PLACEHOLDER_LIST', $module_name . "_list", $php_file_contents);
     $php_file_contents = str_replace('PLACEHOLDER_EDIT', $module_name . "_edit", $php_file_contents);
     $php_file_contents = str_replace('PLACEHOLDER_DELETE', $module_name . "_delete", $php_file_contents);
-    $php_file_contents = str_replace('PLACEHOLDER_SQL_LIST', "SELECT $table_short_name.id, $sql_list_of_columns, $table_short_name.id FROM $module_name $table_short_name", $php_file_contents);
+    $php_file_contents = str_replace('PLACEHOLDER_SQL_LIST', "SELECT SQL_CALC_FOUND_ROWS $table_short_name.id, $sql_list_of_columns, $table_short_name.id FROM $module_name $table_short_name", $php_file_contents);
     $php_file_contents = str_replace('PLACEHOLDER_SQL_EDIT', "INSERT INTO $module_name ($list_of_columns, id) values ('\".implode('\', \'',\$input).\"', \$id) ON DUPLICATE KEY UPDATE SET ", $php_file_contents);
     $php_file_contents = str_replace('PLACEHOLDER_GET_INPUT', $get_input, $php_file_contents);
     $php_file_contents = str_replace('PLACEHOLDER_SET_INPUT', $set_input, $php_file_contents);
diff --git a/www/pages/auftrag.php b/www/pages/auftrag.php
index cf8c8874..f55fb57e 100644
--- a/www/pages/auftrag.php
+++ b/www/pages/auftrag.php
@@ -589,7 +589,7 @@ class Auftrag extends GenAuftrag
 
                 $menu = "";
 
-                $sql = "SELECT 
+                $sql = "SELECT SQL_CALC_FOUND_ROWS
                 a.id,
                 '<img src=./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/details_open.png class=details>' AS `open`, 
                 CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',a.id,'\" />') AS `auswahl`,
@@ -678,7 +678,7 @@ class Auftrag extends GenAuftrag
 
                 $menu = "";
 
-                $sql = "SELECT 
+                $sql = "SELECT SQL_CALC_FOUND_ROWS
                 a.id,
                 '<img src=./themes/{$this->app->Conf->WFconf['defaulttheme']}/images/details_open.png class=details>' AS `open`, 
                 CONCAT('<input type=\"checkbox\" name=\"auswahlcronjob[]\" value=\"',a.id,'\" />') AS `auswahl`,
diff --git a/www/pages/content/ticket_regeln_list.tpl b/www/pages/content/ticket_regeln_list.tpl
deleted file mode 100644
index 9e5659dc..00000000
--- a/www/pages/content/ticket_regeln_list.tpl
+++ /dev/null
@@ -1,266 +0,0 @@
-<!-- gehort zu tabview -->
-<div id="tabs">
-  <ul>
-    <li><a href="#tabs-1">[TABTEXT]</a></li>
-  </ul>
-<!-- ende gehort zu tabview -->
-
-<!-- erstes tab -->
-  <div id="tabs-1">
-    [MESSAGE]
-    <div class="row">
-    <div class="row-height">
-    <div class="col-xs-12 col-md-10 col-md-height">
-    <div class="inside-white inside-full-height">
-
-      <div class="filter-box filter-usersave">
-        <div class="filter-block filter-inline">
-          <div class="filter-title">{|Filter|}</div>
-          <ul class="filter-list">
-            <li class="filter-item">
-              <label for="nuraktive" class="switch">
-                <input type="checkbox" id="nuraktive">
-                <span class="slider round"></span>
-              </label>
-              <label for="nuraktive">&nbsp;{|nur aktive Regeln|}</label>
-            </li>
-          </ul>
-        </div>
-      </div>
-      
-      [TAB1]
-    </div>
-    </div>
-    <div class="col-xs-12 col-md-2 col-md-height">
-    <div class="inside inside-full-height">
-        <fieldset>
-          <legend>{|Aktionen|}</legend>
-          <input type="button" class="btnGreenNew" name="neuereintrag" value="&#10010; Neuer Eintrag" onclick="RegelnEdit(0);">
-        </fieldset>
-      </div>
-      </div>
-      </div>
-      </div>
-  
-    [TAB1NEXT]
-  </div>
-
-<!-- tab view schließen -->
-</div>
-
-<div id="editRegeln" style="display:none;" title="Bearbeiten">
-<form method="post">
-  <input type="hidden" id="e_id">
-  <fieldset>
-  	<legend>{|Regeln Eintrag|}</legend>
-  	<table>
-      <tr>
-        <td width="180">{|Empf&auml;nger E-Mail Adresse|}:</td>
-        <td><input type="text" name="e_empf_email_adresse" id="e_empf_email_adresse" size="40"></td>
-      </tr>
-      <tr>
-        <td>{|Sender E-Mail Adresse|}:</td>
-        <td><input type="text" name="e_email_adresse" id="e_email_adresse" size="40"></td>
-      </tr>
-      <tr>
-        <td>{|Name|}:</td>
-        <td><input type="text" name="e_name" id="e_name" size="40"></td>
-      </tr>
-      <tr>
-        <td>{|Betreff|}:</td>
-        <td><input type="text" name="e_betreff" id="e_betreff" size="40"></td>
-      </tr>
-      <tr>
-        <td>{|Aktiv|}:</td>
-        <td><input type="checkbox" name="e_aktiv" id="e_aktiv" value="1"></td>
-      </tr>
-    </table>
-  </fieldset>
-  <fieldset>
-    <legend>{|Aktion|}</legend>
-    <table>
-      <tr>
-        <td width="180">{|als SPAM markieren|}:</td>
-        <td><input type="checkbox" name="e_spam" id="e_spam" value="1"></td>
-      </tr>
-      <tr>
-        <td>{|als persönlich markieren|}:</td>
-        <td><input type="checkbox" name="e_persoenlich" id="e_persoenlich" value="1"></td>
-      </tr>
-      <tr>
-        <td>{|PRIO Markierung|}:</td>
-        <td><input type="checkbox" name="e_prio" id="e_prio" value="1"></td>
-      </tr>
-      <tr>
-        <td>{|DSGVO Markierung|}:</td>
-        <td><input type="checkbox" name="e_dsgvo" id="e_dsgvo" value="1"></td>
-      </tr>
-      <tr>
-        <td>{|Warteschlange zuordnen|}:</td>
-        <td>
-          <input type="text" id="ticketqueue" class="" tabindex="" name="ticketqueue" value="[WARTESCHLANGE]" size="50" placeholder="" maxlength="">
-        </td>
-      </tr>
-
-    </table>
-  </fieldset>    
-</div>
-</form>
-
-
-<script type="text/javascript">
-
-$(document).ready(function() {
-  $('#e_email_adresse').focus();
-
-  $("#editRegeln").dialog({
-    modal: true,
-    bgiframe: true,
-    closeOnEscape:false,
-    minWidth:650,
-    maxHeight:700,
-    autoOpen: false,
-    buttons: {
-      ABBRECHEN: function() {
-        RegelnReset();
-        $(this).dialog('close');
-      },
-      SPEICHERN: function() {
-        RegelnEditSave();
-      }
-    }
-  });
-
-  $("#editRegeln").dialog({
-    close: function( event, ui ) { RegelnReset();}
-  });
-
-});
-
-
-function RegelnReset()
-{
-  $('#editRegeln').find('#e_id').val('');
-  $('#editRegeln').find('#e_empf_email_adresse').val('');
-  $('#editRegeln').find('#e_email_adresse').val('');
-  $('#editRegeln').find('#e_name').val('');
-  $('#editRegeln').find('#e_betreff').val('');
-  $('#editRegeln').find('#e_spam').prop("checked", false);
-  $('#editRegeln').find('#e_persoenlich').prop("checked", false);
-  $('#editRegeln').find('#e_prio').prop("checked", false);
-  $('#editRegeln').find('#e_dsgvo').prop("checked", false);
-  $('#editRegeln').find('#ticketqueue').val('');
-  $('#editRegeln').find('#e_aktiv').prop("checked", true);
-}
-
-function RegelnEditSave() {
-	$.ajax({
-    url: 'index.php?module=ticket&action=regelnsave',
-    data: {
-      //Alle Felder die fürs editieren vorhanden sind
-      id: $('#e_id').val(),
-      empfaenger_email: $('#e_empf_email_adresse').val(),
-      sender_email: $('#e_email_adresse').val(),
-      name: $('#e_name').val(),
-      betreff: $('#e_betreff').val(),
-      spam: $('#e_spam').prop("checked")?1:0,
-      persoenlich: $('#e_persoenlich').prop("checked")?1:0,
-      prio: $('#e_prio').prop("checked")?1:0,
-      dsgvo: $('#e_dsgvo').prop("checked")?1:0,
-      warteschlange: $('#ticketqueue').val(),
-      aktiv: $('#e_aktiv').prop("checked")?1:0                   
-    },
-    method: 'post',
-    dataType: 'json',
-    beforeSend: function() {
-      App.loading.open();
-    },
-    success: function(data) {
-     	App.loading.close();
-      if (data.status == 1) {
-        RegelnReset();
-        updateLiveTable();
-        $("#editRegeln").dialog('close');
-      } else {
-        alert(data.statusText);
-      }
-    }
-  });
-}
-
-function RegelnEdit(id) {
-  if(id > 0)
-  { 
-    $.ajax({
-      url: 'index.php?module=ticket&action=regelnedit&cmd=get',
-      data: {
-        id: id
-      },
-      method: 'post',
-      dataType: 'json',
-      beforeSend: function() {
-      	App.loading.open();
-      },
-      success: function(data) {
-        $('#editRegeln').find('#e_id').val(data.id);
-        $('#editRegeln').find('#e_empf_email_adresse').val(data.empfaenger_email)
-        $('#editRegeln').find('#e_email_adresse').val(data.sender_email);
-        $('#editRegeln').find('#e_name').val(data.name);
-        $('#editRegeln').find('#e_betreff').val(data.betreff);
-        $('#editRegeln').find('#e_spam').prop("checked",data.spam==1?true:false);
-        $('#editRegeln').find('#e_persoenlich').prop("checked",data.persoenlich==1?true:false);
-        $('#editRegeln').find('#e_prio').prop("checked",data.prio==1?true:false);
-        $('#editRegeln').find('#e_dsgvo').prop("checked",data.dsgvo==1?true:false);
-        $('#editRegeln').find('#ticketqueue').prop("value",data.warteschlange);
-        $('#editRegeln').find('#e_aktiv').prop("checked",data.aktiv==1?true:false);
-                        
-        App.loading.close();
-        $("#editRegeln").dialog('open');
-      }
-    });
-  } else {
-    RegelnReset(); 
-    $("#editRegeln").dialog('open');
-  }
-
-}
-
-function updateLiveTable(i) {
-  var oTableL = $('#ticketregeln').dataTable();
-  var tmp = $('.dataTables_filter input[type=search]').val();
-  oTableL.fnFilter('%');
-  //oTableL.fnFilter('');
-  oTableL.fnFilter(tmp);   
-}
-
-function RegelnDelete(id) {
-  var conf = confirm('Wirklich löschen?');
-  if (conf) {
-    $.ajax({
-      url: 'index.php?module=ticket&action=regelndelete',
-      data: {
-        id: id
-      },
-      method: 'post',
-      dataType: 'json',
-      beforeSend: function() {
-        App.loading.open();
-      },
-      success: function(data) {
-        if (data.status == 1) {
-          updateLiveTable();
-        } else {
-          alert(data.statusText);
-        }
-        App.loading.close();
-      }
-    });
-  }
-
-  return false;
-
-}
-
-</script>
-
-
diff --git a/www/pages/emailbackup.php b/www/pages/emailbackup.php
index 6bd70307..8607931f 100644
--- a/www/pages/emailbackup.php
+++ b/www/pages/emailbackup.php
@@ -47,7 +47,7 @@ $width = array('10%'); // Fill out manually later
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=emailbackup&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.png\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=emailbackup&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
 //                $sql = "SELECT id, angezeigtername, internebeschreibung, benutzername, passwort, server, smtp, ticket, imap_sentfolder_aktiv, imap_sentfolder, imap_port, imap_type, autoresponder, geschaeftsbriefvorlage, autoresponderbetreff, autorespondertext, projekt, emailbackup, adresse, firma, loeschtage, geloescht, ticketloeschen, ticketabgeschlossen, ticketqueue, ticketprojekt, ticketemaileingehend, smtp_extra, smtp_ssl, smtp_port, smtp_frommail, smtp_fromname, client_alias, smtp_authtype, smtp_authparam, smtp_loglevel, autosresponder_blacklist, eigenesignatur, signatur, mutex, abdatum, email, id FROM emailbackup";
-                $sql = "SELECT id, email, angezeigtername, internebeschreibung, benutzername, server, smtp, ticket, emailbackup, id FROM emailbackup";
+                $sql = "SELECT SQL_CALC_FOUND_ROWS id, email, angezeigtername, internebeschreibung, benutzername, server, smtp, ticket, emailbackup, id FROM emailbackup";
 
                 $where = "1";
                 $count = "SELECT count(DISTINCT id) FROM emailbackup WHERE $where";
diff --git a/www/pages/ticket.php b/www/pages/ticket.php
index 1de9e941..d0b5d921 100644
--- a/www/pages/ticket.php
+++ b/www/pages/ticket.php
@@ -70,7 +70,7 @@ class Ticket {
                 $tagstart = "<li class=\"tag-editor-tag\">";
                 $tagend = "</li>";
 
-                $sql = "SELECT 
+                $sql = "SELECT SQL_CALC_FOUND_ROWS 
                         t.id,
                         ".$dropnbox.",
                         t.schluessel,
diff --git a/www/pages/ticketregeln.php b/www/pages/ticketregeln.php
index efcf536e..78f05c57 100644
--- a/www/pages/ticketregeln.php
+++ b/www/pages/ticketregeln.php
@@ -41,7 +41,7 @@ class Ticketregeln {
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=ticketregeln&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=ticketregeln&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
-                $sql = "SELECT t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, w.warteschlange, t.aktiv, t.id FROM ticket_regeln t LEFT JOIN warteschlangen w ON t.warteschlange = w.label";
+                $sql = "SELECT SQL_CALC_FOUND_ROWS t.id, t.empfaenger_email, t.sender_email, t.name, t.betreff, t.spam, t.persoenlich, t.prio, t.dsgvo, w.warteschlange, t.aktiv, t.id FROM ticket_regeln t LEFT JOIN warteschlangen w ON t.warteschlange = w.label";
 
                 $where = "1";
                 $count = "SELECT count(DISTINCT id) FROM ticket_regeln WHERE $where";
diff --git a/www/pages/wareneingang.php b/www/pages/wareneingang.php
index 2684e813..82e017ec 100644
--- a/www/pages/wareneingang.php
+++ b/www/pages/wareneingang.php
@@ -1061,9 +1061,9 @@ class Wareneingang
                 $defaultorder = 6;
                 $defaultorderdesc = 0;
 
-                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=wareneingang&action=distriinhalt&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.png\" border=\"0\"></a>&nbsp;</td></tr></table>";
+                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=wareneingang&action=distriinhalt&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;</td></tr></table>";
 
-                $sql = "SELECT 
+                $sql = "SELECT SQL_CALC_FOUND_ROWS 
                     paketannahme.id, 
                     paketannahme.id, 
                     DATE_FORMAT(paketannahme.datum, '%d.%m.%Y %H:%i'), 
diff --git a/www/pages/warteschlangen.php b/www/pages/warteschlangen.php
index c87e5ec9..3ff80387 100644
--- a/www/pages/warteschlangen.php
+++ b/www/pages/warteschlangen.php
@@ -41,7 +41,7 @@ class Warteschlangen {
 
                 $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=warteschlangen&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.png\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=warteschlangen&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
-                $sql = "SELECT w.id, w.warteschlange, w.label, (SELECT a.name from adresse a WHERE a.id = w.adresse), id FROM warteschlangen w";
+                $sql = "SELECT SQL_CALC_FOUND_ROWS w.id, w.warteschlange, w.label, (SELECT a.name from adresse a WHERE a.id = w.adresse), id FROM warteschlangen w";
 
                 $where = "1";
                 $count = "SELECT count(DISTINCT id) FROM warteschlangen WHERE $where";