diff --git a/apps/emqtt/src/emqtt_message.erl b/apps/emqtt/src/emqtt_message.erl
index 27ad5982d..3ecbd54da 100644
--- a/apps/emqtt/src/emqtt_message.erl
+++ b/apps/emqtt/src/emqtt_message.erl
@@ -22,6 +22,8 @@
 
 -module(emqtt_message).
 
+-author('feng@emqtt.io').
+
 -include("emqtt.hrl").
 
 -include("emqtt_packet.hrl").
@@ -44,8 +46,8 @@
 %% @doc message from packet
 %%
 from_packet(#mqtt_packet{ header = #mqtt_packet_header{ type   = ?PUBLISH,
-                                                        qos    = Qos, 
                                                         retain = Retain, 
+                                                        qos    = Qos,
                                                         dup    = Dup }, 
                           variable = #mqtt_packet_publish{ topic_name = Topic, 
                                                            packet_id  = PacketId }, 
diff --git a/apps/emqtt/src/emqtt_protocol.erl b/apps/emqtt/src/emqtt_protocol.erl
index d5d851d61..6481a2e81 100644
--- a/apps/emqtt/src/emqtt_protocol.erl
+++ b/apps/emqtt/src/emqtt_protocol.erl
@@ -153,14 +153,14 @@ handle_packet(?CONNECT, Packet = #mqtt_packet {
 handle_packet(?PUBLISH, Packet = #mqtt_packet {
                                      header = #mqtt_packet_header {qos = ?QOS_0}}, 
                                  State = #proto_state{session = Session}) ->
-    emqtt_session:publish(Session, {?QOS_0, emqtt_messsage:from_packet(Packet)}),
+    emqtt_session:publish(Session, {?QOS_0, emqtt_message:from_packet(Packet)}),
 	{ok, State};
 
 handle_packet(?PUBLISH, Packet = #mqtt_packet { 
                                      header = #mqtt_packet_header { qos = ?QOS_1 }, 
                                      variable = #mqtt_packet_publish{packet_id = PacketId }}, 
                                  State = #proto_state { session = Session }) ->
-    emqtt_session:publish(Session, {?QOS_1, emqtt_messsage:from_packet(Packet)}),
+    emqtt_session:publish(Session, {?QOS_1, emqtt_message:from_packet(Packet)}),
     send_packet( make_packet(?PUBACK,  PacketId),  State);
 
 handle_packet(?PUBLISH, Packet = #mqtt_packet {