diff --git a/app/build.gradle b/app/build.gradle
index 3575aef..74c9e39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion "21.1.1"
 
     defaultConfig {
         applicationId "org.yaaic"
         minSdkVersion 21
-        targetSdkVersion 21
-        versionCode 1
+        targetSdkVersion 22
+        versionCode 13
         versionName "2.0"
     }
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d91ddcc..6c721c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,13 +21,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.yaaic"
-    android:installLocation="auto"
-    android:versionCode="12"
-    android:versionName="1.1-SNAPSHOT" >
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="17" />
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/app/src/main/res/layout/actionitem.xml b/app/src/main/res/layout/actionitem.xml
index 6af4fc1..ba48701 100644
--- a/app/src/main/res/layout/actionitem.xml
+++ b/app/src/main/res/layout/actionitem.xml
@@ -30,7 +30,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:layout_height="wrap_content"
         android:src="@drawable/action_reply"
         android:layout_gravity="center_vertical" />
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    <TextView
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversations.xml b/app/src/main/res/layout/conversations.xml
index 7ffd1aa..5aa8fd9 100644
--- a/app/src/main/res/layout/conversations.xml
+++ b/app/src/main/res/layout/conversations.xml
@@ -46,8 +46,6 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:inputType="textImeMultiLine"
-            android:textIsSelectable="true"
             android:imeOptions="actionSend" />
         <Button
             android:id="@+id/speech"