Basically this depends on which energy storage solution is best for portability. When energy becomes really cheap it is even possible that making petrol fuels from co2 that is captured from air will be economically feasible. Some fuels/batteries are better per weight some are better per volume. Some are better per price, which I hope FF will reduce a lot.
http://en.wikipedia.org/wiki/File:Energy_density.svg