Merge "Temp fix for swipe bug" into ub-mail-master