diff --git a/src/de/schildbach/pte/util/CharQueue.java b/src/de/schildbach/pte/util/CharQueue.java
index bdb49bad..c0df0d80 100644
--- a/src/de/schildbach/pte/util/CharQueue.java
+++ b/src/de/schildbach/pte/util/CharQueue.java
@@ -92,7 +92,7 @@ final public class CharQueue {
      */
     @Override
     public String toString() {
-        StringBuffer queueString = new StringBuffer(elementCount);
+        StringBuilder queueString = new StringBuilder(elementCount);
         if (queueFront < queueRear) {
             queueString.append(queueElements, queueFront, elementCount);
         } else {
diff --git a/src/de/schildbach/pte/util/StringReplaceReader.java b/src/de/schildbach/pte/util/StringReplaceReader.java
index e2a01df4..da9d1f9c 100644
--- a/src/de/schildbach/pte/util/StringReplaceReader.java
+++ b/src/de/schildbach/pte/util/StringReplaceReader.java
@@ -85,7 +85,7 @@ public class StringReplaceReader extends FilterReader implements Cloneable {
      * Returns the entire contents of the input stream.
      */
     public String contents() throws IOException {
-        StringBuffer contents = new StringBuffer(1024);
+        StringBuilder contents = new StringBuilder(1024);
         int readSize = 512;
 
         char[] filteredChars = new char[readSize];