BUGFIX : reintroduce the fixes from commits 168 & 169, lost in the hildon-wrapper...