--- a/res/values/arrays.xml	Mon Mar 21 21:54:08 2011 +0100
+++ b/res/values/arrays.xml	Mon Mar 21 21:55:23 2011 +0100
@@ -13,6 +13,11 @@
 		<item name="Unavailable">@string/contact_status_msg_xa</item>
 		<item name="Disconnected">@string/contact_status_msg_offline</item>
 	</string-array>
+	<string-array name="pick_photo_items">
+		<item>@string/take_photo</item>
+		<item>@string/pick_photo</item>
+		<item>@string/delete_avatar</item>
+	</string-array>
 	<string-array name="privacy_list_select_dialog">
 		<item name="@string/privacy_list_select_dialog_buddies">Buddies</item>
 		<item name="@string/privacy_list_select_dialog_groups">Groups</item>

--- a/src/com/beem/project/beem/BeemApplication.java	Mon Mar 21 21:54:08 2011 +0100
+++ b/src/com/beem/project/beem/BeemApplication.java	Mon Mar 21 21:55:23 2011 +0100
@@ -94,6 +94,7 @@
 
     private boolean mIsConnected;
     private boolean mIsAccountConfigured;
+    private boolean mPepEnabled;
     private SharedPreferences mSettings;
     private final PreferenceListener mPreferenceListener = new PreferenceListener();
 
@@ -117,7 +118,6 @@
     public void onTerminate() {
 	super.onTerminate();
 	mSettings.unregisterOnSharedPreferenceChangeListener(mPreferenceListener);
-
     }
 
     /**
@@ -145,6 +145,24 @@
     }
 
     /**
+     * Enable Pep in the application context.
+     *
+     * @param enabled true to enable pep
+     */
+    public void setPepEnabled(boolean enabled) {
+	mPepEnabled = enabled;
+    }
+
+    /**
+     * Check if Pep is enabled.
+     *
+     * @return true if enabled
+     */
+    public boolean isPepEnabled() {
+	return mPepEnabled;
+    }
+
+    /**
      * A listener for all the change in the preference file. It is used to maintain the global state of the application.
      */
     private class PreferenceListener implements SharedPreferences.OnSharedPreferenceChangeListener {

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon Mar 21 21:54:08 2011 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon Mar 21 21:55:23 2011 +0100
@@ -127,6 +127,7 @@
     /**
      * Constructor.
      * @param config Configuration to use in order to connect
+     * @param jid the jid of the user
      * @param login login to use on connect
      * @param password password to use on connect
      * @param service the background service associated with the connection.
@@ -414,6 +415,11 @@
 	return mRoster;
     }
 
+    /**
+     * Get the user informations.
+     *
+     * @return the user infos
+     */
     public UserInfo getUserInfo() {
 	return mUserInfo;
     }
@@ -500,7 +506,7 @@
 		}
 	    }
 	} catch (XMPPException e) {
-	    // No Pep
+	    Log.w(TAG, "Unable to discover server features", e);
 	}
     }
 
@@ -509,12 +515,22 @@
      */
     private void initPEP() {
 	// Enable pep sending
+	Log.d(TAG, "Pep enabled");
 	// API 8
 	// mService.getExternalCacheDir()
 	mPepManager = new PepSubManager(mAdaptee);
 	AvatarCache avatarCache = new BeemAvatarCache(mService);
 	mAvatarManager = new BeemAvatarManager(mService, mAdaptee, mPepManager, avatarCache, true);
 	mAvatarManager.addAvatarListener(mUserInfoManager);
+	mApplication.setPepEnabled(true);