diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
index 7656367..22cc3fd 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
@@ -47,7 +47,8 @@ public class HtmlParser implements Parser {
     private static final int META_TAG_BUFFER_SIZE = 4096;
     private static final Pattern HTTP_EQUIV_CHARSET_PATTERN = Pattern
                     .compile("(?is)<meta\\s+http-equiv\\s*=\\s*['\"]\\s*Content-Type['\"]\\s+content\\s*=\\s*['\"][^;]+;\\s*charset\\s*=\\s*([^'\"]+)\"");
-
+    private static final Pattern CONTENT_TYPE_PATTERN = Pattern.compile("(?i);\\s*charset\\s*=\\s*(.*)");
+    
     private String getEncoding(InputStream stream, Metadata metadata) throws IOException {
         // TIKA-332: Check for meta http-equiv tag with charset info in HTML content
         if (!stream.markSupported()) {
@@ -76,13 +77,26 @@ public class HtmlParser implements Parser {
         CharsetDetector detector = new CharsetDetector();
         String incomingCharset = metadata.get(Metadata.CONTENT_ENCODING);
         if (incomingCharset == null) {
-            // TODO: check for charset in metadata's content_type
+            // TIKA-341: Use charset in content-type
+            String contentType = metadata.get(Metadata.CONTENT_TYPE);
+            if (contentType != null) {
+                Matcher m = CONTENT_TYPE_PATTERN.matcher(contentType);
+                if (m.find()) {
+                    String charset = m.group(1).trim();
+                    if (Charset.isSupported(charset)) {
+                        incomingCharset = charset;
+                    }
+                }
+            }
         }
 
         if (incomingCharset != null) {
             detector.setDeclaredEncoding(incomingCharset);
         }
 
+        // TIKA-341 without enabling input filtering (stripping of tags) the
+        // short HTML tests don't work well.
+        detector.enableInputFilter(true);
         detector.setText(stream);
         for (CharsetMatch match : detector.detectAll()) {
             if (Charset.isSupported(match.getName())) {
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java
index 4510ca3..6194fde 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java
@@ -24,6 +24,8 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.DublinCore;
@@ -60,11 +62,12 @@ import org.xml.sax.SAXException;
  */
 public class TXTParser implements Parser {
 
+    private static final Pattern CONTENT_TYPE_PATTERN = Pattern.compile("(?i);\\s*charset\\s*=\\s*(.*)");
+
     public void parse(
             InputStream stream, ContentHandler handler,
             Metadata metadata, ParseContext context)
     throws IOException, SAXException, TikaException {
-        metadata.set(Metadata.CONTENT_TYPE, "text/plain");
 
         // CharsetDetector expects a stream to support marks
         if (!stream.markSupported()) {
@@ -74,10 +77,19 @@ public class TXTParser implements Parser {
         // Detect the content encoding (the stream is reset to the beginning)
         CharsetDetector detector = new CharsetDetector();
         String incomingCharset = metadata.get(Metadata.CONTENT_ENCODING);
+        if (incomingCharset == null) {
+            // TIKA-341: Use charset in content-type
+            String contentType = metadata.get(Metadata.CONTENT_TYPE);
+            if (contentType != null) {
+                Matcher m = CONTENT_TYPE_PATTERN.matcher(contentType);
+                if (m.find()) {
+                    incomingCharset = m.group(1).trim();
+                }
+            }
+        }
+
         if (incomingCharset != null) {
             detector.setDeclaredEncoding(incomingCharset);
-        } else {
-            // TODO: try to extract charset from CONTENT_TYPE in metadata
         }
 
         detector.setText(stream);
@@ -103,6 +115,10 @@ public class TXTParser implements Parser {
                     + " hint is available in document metadata");
         }
 
+        // TIKA-341: Only stomp on content-type after we're done trying to
+        // use it to guess at the charset.
+        metadata.set(Metadata.CONTENT_TYPE, "text/plain");
+
         try {
             Reader reader =
                 new BufferedReader(new InputStreamReader(stream, encoding));
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index 853ed63..89e2e51 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -261,4 +261,25 @@ public class HtmlParserTest extends TestCase {
         assertEquals("en", metadata.get(Metadata.CONTENT_LANGUAGE));
     }
 
+    /**
+     * Test case for TIKA-341
+     * @see <a href="https://issues.apache.org/jira/browse/TIKA-XXX">TIKA-XXX</a>
+     */
+    public void testUsingCharsetInContentTypeHeader() throws Exception {
+        final String test = "<html><head><title>the name is \u00e1ndre</title></head><body></body></html>";
+
+        Metadata metadata = new Metadata();
+        new HtmlParser().parse (
+                new ByteArrayInputStream(test.getBytes("UTF-8")),
+                new BodyContentHandler(),  metadata, new ParseContext());
+        assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING));
+
+        metadata = new Metadata();
+        metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-1");
+        new HtmlParser().parse (
+                new ByteArrayInputStream(test.getBytes("UTF-8")),
+                new BodyContentHandler(),  metadata, new ParseContext());
+        assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING));
+    }
+
 }
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
index 3bdd351..c39ce2d 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/txt/TXTParserTest.java
@@ -140,6 +140,33 @@ public class TXTParserTest extends TestCase {
         assertEquals("en", metadata.get(Metadata.LANGUAGE));
     }
 
+    /**
+     * Test case for TIKA-341: using charset in content-type
+     *
+     * @see <a href="https://issues.apache.org/jira/browse/TIKA-341">TIKA-341</a> 
+     */
+    public void testUsingCharsetInContentTypeHeader() throws Exception {
+        // Could be UTF-8 or ISO 8859-1 or ...
+        // u00e1 is latin small letter a with acute
+        final String test2 = "the name is \u00e1ndre";
+        
+        Metadata metadata = new Metadata();
+        parser.parse(
+                new ByteArrayInputStream(test2.getBytes("UTF-8")),
+                new BodyContentHandler(),  metadata, new ParseContext());
+        
+        assertEquals("UTF-8", metadata.get(Metadata.CONTENT_ENCODING));
+
+        metadata = new Metadata();
+        metadata.set(Metadata.CONTENT_TYPE, "text/html; charset=ISO-8859-1");
+        parser.parse(
+                new ByteArrayInputStream(test2.getBytes("UTF-8")),
+                new BodyContentHandler(),  metadata, new ParseContext());
+        
+        assertEquals("ISO-8859-1", metadata.get(Metadata.CONTENT_ENCODING));
+    }
+
+
     private void assertExtractText(String msg, String expected, byte[] input)
             throws Exception {
         ContentHandler handler = new BodyContentHandler() {