* Ported fix for NB#90182 to hildon2 code