Merged patches from launchpad

see https://launchpad.net/rem2ics/ -> bugs