Index: tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
===================================================================
--- tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java	(revision 1628869)
+++ tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java	(working copy)
@@ -84,8 +84,8 @@
             parser.parse(stream, handler, metadata, new ParseContext());
             verify(handler).startDocument();
             //4 body-part divs -- two outer bodies and two inner bodies
-            verify(handler, times(4)).startElement(eq(XHTMLContentHandler.XHTML), eq("div"), eq("div"), any(Attributes.class));
-            verify(handler, times(4)).endElement(XHTMLContentHandler.XHTML, "div", "div");
+            verify(handler, times(5)).startElement(eq(XHTMLContentHandler.XHTML), eq("div"), eq("div"), any(Attributes.class));
+            verify(handler, times(5)).endElement(XHTMLContentHandler.XHTML, "div", "div");
             //5 paragraph elements, 4 for body-parts and 1 for encompassing message
             verify(handler, times(5)).startElement(eq(XHTMLContentHandler.XHTML), eq("p"), eq("p"), any(Attributes.class));
             verify(handler, times(5)).endElement(XHTMLContentHandler.XHTML, "p", "p");
Index: tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
===================================================================
--- tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java	(revision 1628869)
+++ tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java	(working copy)
@@ -43,7 +43,7 @@
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
-import org.apache.tika.parser.AbstractParser;
+import org.apache.tika.parser.image.ImageParser;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.external.ExternalParser;
 import org.apache.tika.sax.XHTMLContentHandler;
@@ -65,7 +65,7 @@
  * 
  * 
  */
-public class TesseractOCRParser extends AbstractParser {
+public class TesseractOCRParser extends ImageParser {
 	
 	private static final long serialVersionUID = 1L;
 	
@@ -97,7 +97,7 @@
 	
 	public void parse(Image image, ContentHandler handler, Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
-		
+
 		TemporaryResources tmp = new TemporaryResources();
 		FileOutputStream fos = null;
 		TikaInputStream tis = null;
@@ -131,6 +131,11 @@
             InputStream stream, ContentHandler handler,
             Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
+	    
+	    String type = metadata.get(Metadata.CONTENT_TYPE);
+	    if (type != null && super.getSupportedTypes(context).contains(type)){
+	        super.parse(stream, handler, metadata, context);
+	    }
     	TesseractOCRConfig config = context.get(TesseractOCRConfig.class);
     	if(config == null) config = new TesseractOCRConfig();