closes http://git.rcsmobility.com/rcsmobility/synthese/issues/1083 closes http://git.rcsmobility.com/rcsmobility/synthese/issues/991