diff --git a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocMessManager.java b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocMessManager.java
index 8fa4dc0..a319e46 100644
--- a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocMessManager.java
+++ b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocMessManager.java
@@ -24,7 +24,7 @@ public class LocMessManager {
     public interface CompleteCallback{
         void OnComplete(boolean result, String message);
     }
-
+    public static final int PICK_LOCATION_REQUEST=1;
     private static LocMessManager _manager=null;
     private String _currentToken = "undefined";
     private String _username = "undefined";
diff --git a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocationsMenuActivity.java b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocationsMenuActivity.java
index 92e8796..478c462 100644
--- a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocationsMenuActivity.java
+++ b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/LocationsMenuActivity.java
@@ -29,7 +29,7 @@ public class LocationsMenuActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 
     private LocationsListAdapter messagesAdapter;
-    private static final String TAG = "LocationsMeny";
+    private static final String TAG = "LocationsMenu";
     private ListLocationsCommand command;
 
     @Override
@@ -162,4 +162,5 @@ public void addLocation(View v){
         Intent i = new Intent(this, AddLocationActivity.class);
         startActivity(i);
     }
+
 }
diff --git a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/NewMessageActivity.java b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/NewMessageActivity.java
index e1316cc..193a6ff 100644
--- a/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/NewMessageActivity.java
+++ b/android-project/app/src/main/java/pt/ulisboa/tecnico/ist/cmu/locmess/NewMessageActivity.java
@@ -6,6 +6,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.AppCompatSpinner;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +25,7 @@
 public class NewMessageActivity extends AppCompatActivity {
 
     private AbstractCommand command;
+    private String TAG="NewMesageActivity";
 
     private String modes[] = new String[]{
             "Centralized",
@@ -101,7 +103,9 @@ public void selectPolicy(View v){
 
     public void selectLocation(View v){
         Intent i = new Intent(this, LocationsMenuActivity.class);
-        startActivity(i);
+        i.putExtra("chooseLocation","true");
+        startActivityForResult(i, LocMessManager.PICK_LOCATION_REQUEST);
+        //startActivity(i);
     }
 
     public void postMesage(View v){
@@ -141,4 +145,16 @@ public void OnComplete(boolean result, String message) {
             }
         });
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data){
+        Log.d(TAG,"Activity Result inc! The code is "+requestCode);
+        if(requestCode == LocMessManager.PICK_LOCATION_REQUEST){
+            Log.d(TAG,"okokok");
+            if( resultCode ==  RESULT_OK){
+                Log.d(TAG,"AND IT WAS SUCESSFUL!!!");
+                ((TextView) findViewById(R.id.location_name)).setText(data.getStringExtra("locationChoice"));
+            }
+        }
+    }
 }
diff --git a/android-project/app/src/main/res/layout/dialog_location_info.xml b/android-project/app/src/main/res/layout/dialog_location_info.xml
new file mode 100644
index 0000000..280c0b2
--- /dev/null
+++ b/android-project/app/src/main/res/layout/dialog_location_info.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.64"
+        android:text="Text in message"
+        android:textAlignment="center"
+        android:textSize="@dimen/read_message_text"
+        android:layout_marginBottom="@dimen/read_message_text"
+        android:layout_marginTop="@dimen/read_message_text"
+        android:gravity="start"/>
+
+</LinearLayout>