diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php
index 3a81111231..36f8860e5c 100644
--- a/infolog/setup/tables_update.inc.php
+++ b/infolog/setup/tables_update.inc.php
@@ -11,6 +11,8 @@
  * @version $Id$
  */
 
+use EGroupware\Api;
+
 function infolog_upgrade0_9_11()
 {
 	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_infolog','info_datecreated','info_datemodified');
@@ -937,7 +939,13 @@ function infolog_upgrade16_1_002()
  */
 function infolog_upgrade16_1_003()
 {
-	$GLOBALS['egw_setup']->db->query("UPDATE egw_infolog SET info_from = CASE WHEN info_from != '' THEN CONCAT(info_from, ', ', info_addr) ELSE info_addr END".
+	// copy full info_addr to info_des, if length(info_from)+length(info_addr)+2 > 255 and then shorten it to fit
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_infolog SET info_des=".
+		$GLOBALS['egw_setup']->db->concat('info_addr', "\n\n", 'info_des').
+		" WHERE LENGTH(info_from)+LENGTH(info_addr > 253", __LINE__, __FILE__);
+
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_infolog SET info_from = CASE WHEN info_from != '' THEN SUBSTRING(".
+		$GLOBALS['egw_setup']->db->concat('info_from', "', '", 'info_addr')." FROM 1 FOR 255) ELSE info_addr END".
 		" WHERE info_addr != ''", __LINE__, __FILE__);
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('egw_infolog',array(