Fix Eail Factory to support Elementary 1.8