diff --git a/src/main/java/eu/siacs/conversations/xml/TagWriter.java b/src/main/java/eu/siacs/conversations/xml/TagWriter.java
index 0e03fc1e8..4f429377a 100644
--- a/src/main/java/eu/siacs/conversations/xml/TagWriter.java
+++ b/src/main/java/eu/siacs/conversations/xml/TagWriter.java
@@ -14,114 +14,109 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 
 public class TagWriter {
 
-	private OutputStreamWriter outputStream;
-	private boolean finished = false;
-	private final LinkedBlockingQueue<AbstractStanza> writeQueue = new LinkedBlockingQueue<AbstractStanza>();
-	private CountDownLatch stanzaWriterCountDownLatch = null;
+    private OutputStreamWriter outputStream;
+    private boolean finished = false;
+    private final LinkedBlockingQueue<AbstractStanza> writeQueue = new LinkedBlockingQueue<AbstractStanza>();
+    private CountDownLatch stanzaWriterCountDownLatch = null;
 
-	private final Thread asyncStanzaWriter = new Thread() {
+    private final Thread asyncStanzaWriter = new Thread() {
 
-		@Override
-		public void run() {
-			stanzaWriterCountDownLatch = new CountDownLatch(1);
-			while (!isInterrupted()) {
-				if (finished && writeQueue.size() == 0) {
-					break;
-				}
-				try {
-					AbstractStanza output = writeQueue.take();
-					outputStream.write(output.toString());
-					if (writeQueue.size() == 0) {
-						outputStream.flush();
-					}
-				} catch (Exception e) {
-					break;
-				}
-			}
-			stanzaWriterCountDownLatch.countDown();
-		}
+        @Override
+        public void run() {
+            stanzaWriterCountDownLatch = new CountDownLatch(1);
+            while (!isInterrupted()) {
+                if (finished && writeQueue.size() == 0) {
+                    break;
+                }
+                try {
+                    AbstractStanza output = writeQueue.take();
+                    outputStream.write(output.toString());
+                    if (writeQueue.size() == 0) {
+                        outputStream.flush();
+                    }
+                } catch (Exception e) {
+                    break;
+                }
+            }
+            stanzaWriterCountDownLatch.countDown();
+        }
 
-	};
+    };
 
-	public TagWriter() {
-	}
+    public TagWriter() {
+    }
 
-	public synchronized void setOutputStream(OutputStream out) throws IOException {
-		if (out == null) {
-			throw new IOException();
-		}
-		this.outputStream = new OutputStreamWriter(out);
-	}
+    public synchronized void setOutputStream(OutputStream out) throws IOException {
+        if (out == null) {
+            throw new IOException();
+        }
+        this.outputStream = new OutputStreamWriter(out);
+    }
 
-	public TagWriter beginDocument() throws IOException {
-		if (outputStream == null) {
-			throw new IOException("output stream was null");
-		}
-		outputStream.write("<?xml version='1.0'?>");
-		outputStream.flush();
-		return this;
-	}
+    public void beginDocument() throws IOException {
+        if (outputStream == null) {
+            throw new IOException("output stream was null");
+        }
+        outputStream.write("<?xml version='1.0'?>");
+        outputStream.flush();
+    }
 
-	public synchronized  TagWriter writeTag(Tag tag) throws IOException {
-		if (outputStream == null) {
-			throw new IOException("output stream was null");
-		}
-		outputStream.write(tag.toString());
-		outputStream.flush();
-		return this;
-	}
+    public synchronized void writeTag(Tag tag) throws IOException {
+        if (outputStream == null) {
+            throw new IOException("output stream was null");
+        }
+        outputStream.write(tag.toString());
+        outputStream.flush();
+    }
 
-	public synchronized TagWriter writeElement(Element element) throws IOException {
-		if (outputStream == null) {
-			throw new IOException("output stream was null");
-		}
-		outputStream.write(element.toString());
-		outputStream.flush();
-		return this;
-	}
+    public synchronized void writeElement(Element element) throws IOException {
+        if (outputStream == null) {
+            throw new IOException("output stream was null");
+        }
+        outputStream.write(element.toString());
+        outputStream.flush();
+    }
 
-	public TagWriter writeStanzaAsync(AbstractStanza stanza) {
-		if (finished) {
-			Log.d(Config.LOGTAG,"attempting to write stanza to finished TagWriter");
-			return this;
-		} else {
-			if (!asyncStanzaWriter.isAlive()) {
-				try {
-					asyncStanzaWriter.start();
-				} catch (IllegalThreadStateException e) {
-					// already started
-				}
-			}
-			writeQueue.add(stanza);
-			return this;
-		}
-	}
+    public void writeStanzaAsync(AbstractStanza stanza) {
+        if (finished) {
+            Log.d(Config.LOGTAG, "attempting to write stanza to finished TagWriter");
+        } else {
+            if (!asyncStanzaWriter.isAlive()) {
+                try {
+                    asyncStanzaWriter.start();
+                } catch (IllegalThreadStateException e) {
+                    // already started
+                }
+            }
+            writeQueue.add(stanza);
+        }
+    }
 
-	public void finish() {
-		this.finished = true;
-	}
+    public void finish() {
+        this.finished = true;
+    }
 
-	public boolean await(long timeout, TimeUnit timeunit) throws InterruptedException {
-		if (stanzaWriterCountDownLatch == null) {
-			return true;
-		} else {
-			return stanzaWriterCountDownLatch.await(timeout, timeunit);
-		}
-	}
+    public boolean await(long timeout, TimeUnit timeunit) throws InterruptedException {
+        if (stanzaWriterCountDownLatch == null) {
+            return true;
+        } else {
+            return stanzaWriterCountDownLatch.await(timeout, timeunit);
+        }
+    }
 
-	public boolean isActive() {
-		return outputStream != null;
-	}
+    public boolean isActive() {
+        return outputStream != null;
+    }
 
-	public synchronized void forceClose() {
-		asyncStanzaWriter.interrupt();
-		if (outputStream != null) {
-			try {
-				outputStream.close();
-			} catch (IOException e) {
-				//ignoring
-			}
-		}
-		outputStream = null;
-	}
+    public synchronized void forceClose() {
+        asyncStanzaWriter.interrupt();
+        if (outputStream != null) {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                //ignoring
+            }
+        }
+        outputStream = null;
+    }
 }