Improved bugfix for bug 7335.
Improved bugfix for bug 7335.

nilei/otrs,mburggraf/otrs,brandonshults01/otrs,linearregression/otrs,nilei/otrs,brandonshults01/otrs,crythias/otrs,brandonshults01/otrs,muehlbauer/otrs,StCyr/otrs,PortgasDAce/otrs,noritnk/otrs,rudy500/otrs,PortgasDAce/otrs,moritz/otrs,balazj/otrs,s7design/otrs,crythias/otrs,oiami/otrs,xhoy/otrs,balazj/otrs,mbeijen/otrs-1,MBRG/otrs,mburggraf/otrs,muehlbauer/otrs,linearregression/otrs,linearregression/otrs,vlascoder/otrs,thorsteneckel/otrs,capeit-tto/otrs,xhoy/otrs,rudy500/otrs,eliasp/otrs,MBRG/otrs,crythias/otrs,noritnk/otrs,linearregression/otrs,eliasp/otrs,oiami/otrs,capeit-tto/otrs,PortgasDAce/otrs,MBRG/otrs,noritnk/otrs,muehlbauer/otrs,StCyr/otrs,StCyr/otrs,mburggraf/otrs,StCyr/otrs,PortgasDAce/otrs,eliasp/otrs,eliasp/otrs,thorsteneckel/otrs,muehlbauer/otrs,xhoy/otrs,mburggraf/otrs,rudy500/otrs,nilei/otrs,nilei/otrs,rudy500/otrs,linearregression/otrs,s7design/otrs,brandonshults01/otrs,PortgasDAce/otrs,balazj/otrs,capeit-tto/otrs,balazj/otrs,MBRG/otrs,xhoy/otrs,nilei/otrs,moritz/otrs,s7design/otrs,mbeijen/otrs-1,balazj/otrs,vlascoder/otrs,xhoy/otrs,mbeijen/otrs-1,vlascoder/otrs,crythias/otrs,moritz/otrs,mburggraf/otrs,brandonshults01/otrs,thorsteneckel/otrs,s7design/otrs,crythias/otrs,s7design/otrs,thorsteneckel/otrs,rudy500/otrs,oiami/otrs,StCyr/otrs,MBRG/otrs,thorsteneckel/otrs,muehlbauer/otrs,eliasp/otrs,oiami/otrs,oiami/otrs,moritz/otrs,moritz/otrs