diff --git a/src/dfmt.d b/src/dfmt.d
index a037a32..a794075 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -289,6 +289,17 @@ private:
                 newline();
             }
         }
+        else if (current.type == tok!"else")
+        {
+            writeToken();
+            if (current.type == tok!"if")
+                write(" ");
+            else if (current.type != tok!"{")
+            {
+                pushIndent();
+                newline();
+            }
+        }
         else if (isKeyword(current.type))
         {
             switch (current.type)
diff --git a/tests/issue0021.d b/tests/issue0021.d
new file mode 100644
index 0000000..3b01128
--- /dev/null
+++ b/tests/issue0021.d
@@ -0,0 +1,9 @@
+void func()
+{
+	if (!negative)
+		return this;
+	else if (a.negative)
+		return max();
+	else
+		return a.value == 0 ? a : this;
+}
diff --git a/tests/issue0021.d.ref b/tests/issue0021.d.ref
new file mode 100644
index 0000000..ed28391
--- /dev/null
+++ b/tests/issue0021.d.ref
@@ -0,0 +1,9 @@
+void func()
+{
+    if (!negative)
+        return this;
+    else if (a.negative)
+        return max();
+    else
+        return a.value == 0 ? a : this;
+}