Fixing imap and push

use short syntax