Email problem workaround: https://drupal.org/node/1488650