diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/Messages.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/Messages.java
index 5bd0f3e965..bd93c8620e 100644
--- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/Messages.java
+++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/Messages.java
@@ -63,6 +63,7 @@ public class Messages extends NLS {
 	public static String SARLArgumentsTab_2;
 	public static String SARLArgumentsTab_3;
 	public static String SARLArgumentsTab_4;
+	public static String SARLArgumentsTab_5;
 	public static String SARLMainLaunchConfigurationTab_0;
 	public static String SARLMainLaunchConfigurationTab_1;
 	public static String SARLMainLaunchConfigurationTab_2;
diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLArgumentsTab.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLArgumentsTab.java
index e1c077d86d..8571d11592 100644
--- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLArgumentsTab.java
+++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLArgumentsTab.java
@@ -25,10 +25,10 @@
 
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.ui.StringVariableSelectionDialog;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
 import org.eclipse.jdt.internal.debug.ui.actions.ControlAccessibleListener;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
 import org.eclipse.jdt.internal.debug.ui.launcher.VMArgumentsBlock;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -158,7 +158,7 @@ public void modifyText(ModifyEvent evt) {
 	}
 
 	private void createSREArgsVariableButton(Group group) {
-		final Button sreArgVariableButton = createPushButton(group, LauncherMessages.JavaArgumentsTab_5, null);
+		final Button sreArgVariableButton = createPushButton(group, "", null); //$NON-NLS-1$
 		sreArgVariableButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		sreArgVariableButton.addSelectionListener(new SelectionAdapter() {
 			@SuppressWarnings("synthetic-access")
@@ -205,6 +205,9 @@ public void createControl(Composite parent) {
 			final Group group = (Group) this.fVMArgumentsText.getParent();
 			group.setText(Messages.SARLArgumentsTab_3);
 			ControlAccessibleListener.addListener(this.fVMArgumentsText, group.getText());
+
+			// Add the message for the max memory
+			SWTFactory.createLabel(group, Messages.SARLArgumentsTab_5, 0);
 		}
 
 	}
diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLLaunchConfigurationTabGroup.java b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLLaunchConfigurationTabGroup.java
index b326f121a9..dd6413bf1d 100644
--- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLLaunchConfigurationTabGroup.java
+++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/SARLLaunchConfigurationTabGroup.java
@@ -29,6 +29,7 @@
 import org.eclipse.debug.ui.EnvironmentTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
 
 /**
@@ -57,6 +58,7 @@ public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
 			new SARLArgumentsTab(),
 			new SARLRuntimeEnvironmentTab(),
 			new JavaClasspathTab(),
+			new SourceLookupTab(),
 			new EnvironmentTab(),
 			new CommonTab(),
 		};
diff --git a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/messages.properties b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/messages.properties
index 90fe7f9662..f21901eb1d 100644
--- a/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/messages.properties
+++ b/eclipse-sarl/plugins/io.sarl.eclipse/src/io/sarl/eclipse/launching/dialog/messages.properties
@@ -28,6 +28,7 @@ SARLArgumentsTab_1=Arguments for the SARL runtime environment (SRE):
 SARLArgumentsTab_2=Arguments for the Java virtual machine (JVM):
 SARLArgumentsTab_3=Arguments for the Java virtual machine (JVM):
 SARLArgumentsTab_4=Exception occurred reading configuration: {0}
+SARLArgumentsTab_5=For setting the max memory size of your application, use "-Xmx <SIZE>M"
 SARLMainLaunchConfigurationTab_0=Run in the SARL product VM (experimental)
 SARLMainLaunchConfigurationTab_1=Enable assertions in debug mode
 SARLMainLaunchConfigurationTab_2=Enable assertions in run mode