diff --git a/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java b/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
index 15fdae608d76be4e00f55e831d6076c2093efd41..9790ee87440c3a8be95e0561c16c6a2a7acb2fd9 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
@@ -54,7 +54,7 @@ public class GLESRender implements Renderer{
 
 	public void onSurfaceChanged(GL10 gl, int width, int height) {
 		mGModel.viewInit(width, height);
-		_width = width + 5;
+		_width = width;
 		_height = height;
 	}
 
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index 2440c94010544958ccf9337e1dc9c91faf92dec8..cfbaebc8753b98f74f681ab567177d6929e88c77 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -1,7 +1,9 @@
 package org.geuz.onelab;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -121,21 +123,36 @@ public class MainActivity extends Activity{
     		_gmsh.onelabCB("stop");
     	}
     	else if(item.getTitle().equals("Share ...")) {
-    		File file = new File(this.getExternalFilesDir(null), "onelab_screenshot.png");
-			file.setReadable(true, false);
-			_modelFragment.takeScreenshot(file);
-			Intent shareIntent = new Intent();
-			shareIntent.setAction(Intent.ACTION_SEND);
-			shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
-			shareIntent.setType("image/jpeg");
-			startActivity(Intent.createChooser(shareIntent, "Share screenshot with ..."));
+    		if(this._compute) {
+				AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+    			_errorDialog = dialogBuilder.setTitle("Can't show the models list")
+    			.setMessage("The computing have to be finished before you can take a screenshot.")
+    			.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+					
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.dismiss();
+					}
+				})
+    			.show();
+    		}
+    		else {
+    			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
+    			File file = new File(this.getExternalFilesDir(null), "onelab-screenshot-"+dateFormat.format(new Date())+".png");
+    			file.setReadable(true, false);
+    			_modelFragment.takeScreenshot(file);
+    			Intent shareIntent = new Intent();
+    			shareIntent.setAction(Intent.ACTION_SEND);
+    			shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
+    			shareIntent.setType("image/jpeg");
+    			startActivity(Intent.createChooser(shareIntent, "Share screenshot with"));
+    		}
     	}
 		else if(item.getItemId() == android.R.id.home)
 		{
 			if(this._compute) {
 				AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
     			_errorDialog = dialogBuilder.setTitle("Can't show the models list")
-    			.setMessage("The compute have to be finished before you can select an other model.")
+    			.setMessage("The computing have to be finished before you can select an other model.")
     			.setPositiveButton("OK", new DialogInterface.OnClickListener() {
 					
 					public void onClick(DialogInterface dialog, int which) {