--- a/res/layout/preferences.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/preferences.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -101,7 +101,7 @@
 		<EditTextPreference
 			android:name="password"
 			android:singleLine="true"
-			android:password="true"
+			android:inputType="textPassword"
 			android:summary="@string/SettingsPassword"
 			android:title="@string/settings_account_password"
 			android:key="account_password" />
@@ -117,7 +117,7 @@
 			android:key="settings_key_priority"
 			android:title="@string/SettingsPriorityTitle"
 			android:summary="@string/SettingsPrioritySummary"
-			android:numeric="signed"
+			android:inputType="numberSigned"
 			android:defaultValue="0" />
 	</PreferenceCategory>
 	<PreferenceCategory
@@ -155,7 +155,7 @@
 					android:summary="@string/SettingsProxyPort"
 					android:title="@string/settings_proxy_port"
 					android:key="proxy_port"
-					android:numeric="signed"
+					android:inputType="numberSigned"
 					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory
@@ -171,7 +171,7 @@
 					android:singleLine="true"
 					android:dependency="proxy_use"
 					android:name="pass_user"
-					android:password="true"
+					android:inputType="textPassword"
 					android:summary="@string/SettingsProxyPassword"
 					android:title="@string/settings_proxy_password"
 					android:key="proxy_password" />
@@ -219,7 +219,7 @@
 				android:summary="@string/SettingsAdvancedPortOpt"
 				android:title="@string/settings_xmpp_port"
 				android:defaultValue="5222"
-				android:numeric="signed"
+				android:inputType="numberSigned"
 				android:key="settings_key_xmpp_port"
 				android:hint="@string/comments_xmpp_port" />
 			<CheckBoxPreference