Reordered inline and smarty fetch
Updated email submodule