diff --git a/application/views/ReplicantStatusView.h b/application/views/ReplicantStatusView.h
index ad323b7..c757c93 100644
--- a/application/views/ReplicantStatusView.h
+++ b/application/views/ReplicantStatusView.h
@@ -16,12 +16,12 @@
 #include "CayaConstants.h"
 #include "CayaResources.h"
 
+
 class BPopUpMenu;
 class BMenuField;
 
 class BitmapView;
 class NicknameTextControl;
-
 class ReplicantHandler;
 
 class ReplicantStatusView : public BView {
diff --git a/protocols/aim/AIM.cpp b/protocols/aim/AIM.cpp
index c9477d1..763a168 100644
--- a/protocols/aim/AIM.cpp
+++ b/protocols/aim/AIM.cpp
@@ -124,8 +124,8 @@ AIMProtocol::Process(BMessage* msg)
 						case CAYA_AWAY:
 							imcomm_set_away(fIMCommHandle, smsg);
 							break;
-						case CAYA_EXTENDED_AWAY:
-							imcomm_set_away(fIMCommHandle, smsg);
+						case CAYA_CUSTOM_STATUS:
+							//imcomm_set_away(fIMCommHandle, smsg);
 							//UnsupportedOperation(); ?
 							break;
 						case CAYA_DO_NOT_DISTURB:
@@ -408,7 +408,7 @@ AIMProtocol::BuddyAwayMsg(void* imcomm, char* who, char* awaymsg)
 	msg.AddInt32("im_what", IM_STATUS_SET);
 	msg.AddString("protocol", kProtocolSignature);
 	msg.AddString("id", who);
-	msg.AddInt32("status", CAYA_EXTENDED_AWAY);
+	msg.AddInt32("status", CAYA_AWAY);
 	msg.AddString("message", strip_html(awaymsg));
 
 	gServerMsgr->SendMessage(&msg);