diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
index 1196a850af1747903818d715212cebbf08c2bd30..cfb76cbceab5828309cbd4799eda8d9c4e9dead6 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
@@ -304,8 +304,8 @@ static bool flag_is_valid(const char *flag)
 			(strcmp(atom, "\\SEEN") != 0) &&
 			(strcmp(atom, "\\DRAFT") != 0) )  
 		{           
-    	return FALSE;
-    }
+			return FALSE;
+		}
 	} else {
 		/* Custom keyword:
 		 *
diff --git a/src/lib-sieve/sieve-binary.c b/src/lib-sieve/sieve-binary.c
index 0c48faa404d824ac4af2651c9b401581f85dcb37..8e3851527f6e347ec417fc43fe1536391d0da802 100644
--- a/src/lib-sieve/sieve-binary.c
+++ b/src/lib-sieve/sieve-binary.c
@@ -745,7 +745,6 @@ static bool _file_memory_load(struct sieve_binary_file *file)
 	i_assert(file->fd > 0);
 		
 	/* Allocate memory buffer
-	 * FIXME: provide mmap support 
 	 */
 	indata = p_malloc(file->pool, file->st.st_size);
 	size = file->st.st_size; 
@@ -1706,11 +1705,11 @@ const void *sieve_binary_read_extension_object
 {
 	unsigned int code;
 
-    if ( reg->count == 0 ) 
-        return NULL;
+	if ( reg->count == 0 ) 
+		return NULL;
 
-    if ( reg->count == 1 )
-        return reg->objects;
+	if ( reg->count == 1 )
+		return reg->objects;
 
 	if ( ADDR_BYTES_LEFT(sbin, address) <= 0 )
 		return NULL;
@@ -1718,8 +1717,8 @@ const void *sieve_binary_read_extension_object
 	code = ADDR_DATA_AT(sbin, address);
 	ADDR_JUMP(address, 1);	
 
-    if ( code >= reg->count )
+	if ( code >= reg->count )
 		return NULL;
 
-    return ((const void *const *) reg->objects)[code];
+	return ((const void *const *) reg->objects)[code];
 }
diff --git a/src/lib-sieve/sieve-parser.c b/src/lib-sieve/sieve-parser.c
index dca725d4bfe985cfe1a11d39cf21d3d8aa832f47..03215b283ec4cfde73f1f15f86d83a4da94f884d 100644
--- a/src/lib-sieve/sieve-parser.c
+++ b/src/lib-sieve/sieve-parser.c
@@ -15,10 +15,6 @@
 #include "sieve-error.h"
 #include "sieve-ast.h"
 
-/* FIXME: Enforce maximums on the number of arguments, tests, commands, 
- * nesting levels, etc.
- */
-
 /*
  * Forward declarations
  */