diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index ef2bbd1..dd97ee1 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -142,30 +142,27 @@ int messages_set_folder(void *s, const char *name, gboolean cdup)
 	return 0;
 }
 
-int messages_get_folder_listing(void *session,
-		const char *name,
-		uint16_t max, uint16_t offset,
-		messages_folder_listing_cb callback,
-		void *user_data)
+int messages_get_folder_listing(void *session, const char *name, uint16_t max,
+					uint16_t offset,
+					messages_folder_listing_cb callback,
+					void *user_data)
 {
 	return -EINVAL;
 }
 
-int messages_get_messages_listing(void *session,
-		const char *name,
-		uint16_t max, uint16_t offset,
-		const struct messages_filter *filter,
-		messages_get_messages_listing_cb callback,
-		void *user_data)
+int messages_get_messages_listing(void *session, const char *name,
+				uint16_t max, uint16_t offset,
+				const struct messages_filter *filter,
+				messages_get_messages_listing_cb callback,
+				void *user_data)
 {
 	return -EINVAL;
 }
 
-int messages_get_message(void *session,
-		const char *handle,
-		unsigned long flags,
-		messages_get_message_cb callback,
-		void *user_data)
+int messages_get_message(void *session, const char *handle,
+					unsigned long flags,
+					messages_get_message_cb callback,
+					void *user_data)
 {
 	return -EINVAL;
 }
diff --git a/obexd/plugins/messages-tracker.c b/obexd/plugins/messages-tracker.c
index 31d6949..8d9d8bd 100644
--- a/obexd/plugins/messages-tracker.c
+++ b/obexd/plugins/messages-tracker.c
@@ -313,11 +313,10 @@ int messages_get_messages_listing(void *session,
 	return -EINVAL;
 }
 
-int messages_get_message(void *session,
-		const char *handle,
-		unsigned long flags,
-		messages_get_message_cb callback,
-		void *user_data)
+int messages_get_message(void *session, const char *handle,
+				unsigned long flags,
+				messages_get_message_cb callback,
+				void *user_data)
 {
 	return -EINVAL;
 }
diff --git a/obexd/plugins/messages.h b/obexd/plugins/messages.h
index 8c014aa..00a040c 100644
--- a/obexd/plugins/messages.h
+++ b/obexd/plugins/messages.h
@@ -205,11 +205,10 @@ int messages_set_folder(void *session, const char *name, gboolean cdup);
 typedef void (*messages_folder_listing_cb)(void *session, int err,
 		uint16_t size, const char *name, void *user_data);
 
-int messages_get_folder_listing(void *session,
-		const char *name,
-		uint16_t max, uint16_t offset,
-		messages_folder_listing_cb callback,
-		void *user_data);
+int messages_get_folder_listing(void *session, const char *name, uint16_t max,
+				uint16_t offset,
+				messages_folder_listing_cb callback,
+				void *user_data);
 
 /* Retrieves messages listing from a current directory.
  *
@@ -224,16 +223,15 @@ int messages_get_folder_listing(void *session,
  * in 'message'.
  */
 typedef void (*messages_get_messages_listing_cb)(void *session, int err,
-		uint16_t size, gboolean newmsg,
-		const struct messages_message *message,
-		void *user_data);
+					uint16_t size, gboolean newmsg,
+					const struct messages_message *message,
+					void *user_data);
 
-int messages_get_messages_listing(void *session,
-		const char *name,
-		uint16_t max, uint16_t offset,
-		const struct messages_filter *filter,
-		messages_get_messages_listing_cb callback,
-		void *user_data);
+int messages_get_messages_listing(void *session, const char *name,
+				uint16_t max, uint16_t offset,
+				const struct messages_filter *filter,
+				messages_get_messages_listing_cb callback,
+				void *user_data);
 
 #define MESSAGES_ATTACHMENT	(1 << 0)
 #define MESSAGES_UTF8		(1 << 1)
@@ -262,11 +260,10 @@ int messages_get_messages_listing(void *session,
 typedef void (*messages_get_message_cb)(void *session, int err, gboolean fmore,
 	const char *chunk, void *user_data);
 
-int messages_get_message(void *session,
-		const char *handle,
-		unsigned long flags,
-		messages_get_message_cb callback,
-		void *user_data);
+int messages_get_message(void *session, const char *handle,
+					unsigned long flags,
+					messages_get_message_cb callback,
+					void *user_data);
 
 /* Informs Message Server to Update Inbox via network.
  *