diff --git a/app/app.iml b/app/app.iml
index 5a32cb1..253dfbf 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -56,6 +56,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/android-scala" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/app/build.gradle b/app/build.gradle
index 356a44f..23371e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,20 +1,54 @@
 apply plugin: 'com.android.application'
+apply plugin: 'android-scala'
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.0"
+    }
+}
+
+dependencies {
+    compile "org.scala-lang:scala-library:2.11.2"
+}
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion "android-20"
     buildToolsVersion "20.0.0"
 
     defaultConfig {
         applicationId "com.nutomic.ensichat"
         minSdkVersion 15
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "0.1.0"
     }
+
+    sourceSets {
+        main {
+            scala {
+                srcDir "src/main/scala"
+            }
+        }
+
+        androidTest {
+            scala {
+                srcDir "src/androidTest/scala"
+            }
+        }
+    }
+
     buildTypes {
+        debug {
+            runProguard true
+            proguardFile file("proguard-rules.pro")
+        }
+
         release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            runProguard true
+            proguardFile file("proguard-rules.pro")
         }
     }
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9643f24..089daa1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,10 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontoptimize
+-dontobfuscate
+-dontpreverify
+-dontwarn scala.**
+-keep class !scala*.** { *; }
+-ignorewarnings
diff --git a/app/src/androidTest/java/com/nutomic/ensichat/ApplicationTest.java b/app/src/androidTest/java/com/nutomic/ensichat/ApplicationTest.java
deleted file mode 100644
index 54458b2..0000000
--- a/app/src/androidTest/java/com/nutomic/ensichat/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.nutomic.ensichat;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java b/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java
deleted file mode 100644
index 750b72f..0000000
--- a/app/src/main/java/com/nutomic/ensichat/activities/MainActivity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.nutomic.ensichat.activities;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.nutomic.ensichat.R;
-
-
-public class MainActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-
-}
diff --git a/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java b/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java
deleted file mode 100644
index d1dad48..0000000
--- a/app/src/main/java/com/nutomic/ensichat/fragments/ContactsFragment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.nutomic.ensichat.fragments;
-
-import android.app.ListFragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.nutomic.ensichat.R;
-
-public class ContactsFragment extends ListFragment {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_main, container, false);
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_contacts.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_main.xml
rename to app/src/main/res/layout/fragment_contacts.xml
diff --git a/app/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala b/app/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
new file mode 100644
index 0000000..3931d4d
--- /dev/null
+++ b/app/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
@@ -0,0 +1,15 @@
+package com.nutomic.ensichat.activities
+
+import android.app.Activity
+import android.os.Bundle
+
+import com.nutomic.ensichat.R
+
+class MainActivity extends Activity {
+
+  override def onCreate(savedInstanceState: Bundle): Unit = {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
+  }
+
+}
diff --git a/app/src/main/scala/com/nutomic/ensichat/fragments/ContactsFragment.scala b/app/src/main/scala/com/nutomic/ensichat/fragments/ContactsFragment.scala
new file mode 100644
index 0000000..747278d
--- /dev/null
+++ b/app/src/main/scala/com/nutomic/ensichat/fragments/ContactsFragment.scala
@@ -0,0 +1,18 @@
+package com.nutomic.ensichat.fragments
+
+import android.app.Fragment
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+import com.nutomic.ensichat.R
+
+class ContactsFragment extends Fragment {
+
+  override def onCreateView(inflater: LayoutInflater, container: ViewGroup,
+        savedInstanceState: Bundle): View = {
+    return inflater.inflate(R.layout.fragment_contacts, container, false)
+  }
+
+}