Refactor Email, FB and Gallery apps