diff --git a/IPython/nbconvert/templates/markdown.tpl b/IPython/nbconvert/templates/markdown.tpl
index a759470..20791b0 100644
--- a/IPython/nbconvert/templates/markdown.tpl
+++ b/IPython/nbconvert/templates/markdown.tpl
@@ -2,19 +2,13 @@
 
 
 {% block in_prompt %}
-In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
 {% endblock in_prompt %}
 
 {% block output_prompt %}
-{% if cell.haspyout %}
-Out[{{ cell.prompt_number }}]:
-{%- endif %}
 {%- endblock output_prompt %}
 
 {% block input %}
-```
-{{ cell.input }}
-```
+{{ cell.input | indent(4)}}
 {% endblock input %}
 
 {% block pyerr %}
@@ -26,6 +20,7 @@ Out[{{ cell.prompt_number }}]:
 {% endblock traceback_line %}
 
 {% block pyout %}
+
 {% block data_priority scoped %}
 {{ super() }}
 {% endblock %}
@@ -48,11 +43,13 @@ Out[{{ cell.prompt_number }}]:
 {% endblock data_jpg %}
 
 {% block data_latex %}
-$$
 {{ output.latex }}
-$$
 {% endblock data_latex %}
 
+{% block data_html scoped %}
+{{ output.html }}
+{% endblock data_html %}
+
 {% block data_text scoped %}
 {{ output.text | indent }}
 {% endblock data_text %}
@@ -61,6 +58,7 @@ $$
 {{ cell.source | wrap_text(80) }}
 {% endblock markdowncell %}
 
+
 {% block headingcell scoped %}
 {{ '#' * cell.level }} {{ cell.source | replace('\n', ' ') }}
 {% endblock headingcell %}
diff --git a/IPython/nbconvert/templates/rst.tpl b/IPython/nbconvert/templates/rst.tpl
index 463a0e8..d0a7fc2 100644
--- a/IPython/nbconvert/templates/rst.tpl
+++ b/IPython/nbconvert/templates/rst.tpl
@@ -2,25 +2,22 @@
 
 
 {% block in_prompt %}
-
-In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
-
-.. code:: python
-
 {% endblock in_prompt %}
 
 {% block output_prompt %}
-{% if cell.haspyout -%}
-    Out[{{ cell.prompt_number }}]:
-{% endif %}
 {% endblock output_prompt %}
 
 {% block input %}
+{%- if not cell.input.isspace() -%}
+.. code:: python
+
 {{ cell.input | indent}}
+{%- endif -%}
 {% endblock input %}
 
 {% block pyerr %}
 ::
+
 {{ super() }}
 {% endblock pyerr %}
 
@@ -49,19 +46,27 @@ In[{{ cell.prompt_number if cell.prompt_number else ' ' }}]:
 {% endblock data_png %}
 
 {% block data_jpg %}
-..jpg image:: {{ output.jpg_filename }}
+.. image:: {{ output.jpeg_filename }}
 {% endblock data_jpg %}
 
 {% block data_latex %}
 .. math::
-{{ output.latex | indent }}
+
+{{ output.latex | strip_dollars | indent }}
 {% endblock data_latex %}
 
 {% block data_text scoped %}
 .. parsed-literal::
+
 {{ output.text | indent }}
 {% endblock data_text %}
 
+{% block data_html scoped %}
+.. raw:: html
+
+{{ output.html | indent }}
+{% endblock data_html %}
+
 {% block markdowncell scoped %}
 {{ cell.source | markdown2rst }}
 {% endblock markdowncell %}