diff --git a/app/src/apkFlavor/java/com/jens/automation2/Rule.java b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
index 842c4c6..b9b2316 100644
--- a/app/src/apkFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/apkFlavor/java/com/jens/automation2/Rule.java
@@ -107,7 +107,7 @@ public class Rule implements Comparable<Rule>
 	}
 	public void setName(String name)
 	{
-		this.name = name;
+		this.name = name.trim();
 	}
 
 	public static void readFromFile()
diff --git a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
index faffcdf..d83f5e9 100644
--- a/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/fdroidFlavor/java/com/jens/automation2/Rule.java
@@ -104,7 +104,7 @@ public class Rule implements Comparable<Rule>
 	}
 	public void setName(String name)
 	{
-		this.name = name;
+		this.name = name.trim();
 	}
 
 	public static void readFromFile()
diff --git a/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java b/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java
index e433e50..9464987 100644
--- a/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java
+++ b/app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java
@@ -107,7 +107,7 @@ public class Rule implements Comparable<Rule>
 	}
 	public void setName(String name)
 	{
-		this.name = name;
+		this.name = name.trim();
 	}
 
 	public static void readFromFile()
diff --git a/app/src/main/java/com/jens/automation2/PointOfInterest.java b/app/src/main/java/com/jens/automation2/PointOfInterest.java
index eb0a766..2f87886 100644
--- a/app/src/main/java/com/jens/automation2/PointOfInterest.java
+++ b/app/src/main/java/com/jens/automation2/PointOfInterest.java
@@ -64,7 +64,7 @@ public class PointOfInterest implements Comparable<PointOfInterest>
 	public void setName(String desiredName)
 	{
 		this.oldName = this.name;
-		this.name = desiredName;
+		this.name = desiredName.trim();
 	}
 
 	public Location getLocation()
diff --git a/app/src/main/java/com/jens/automation2/Profile.java b/app/src/main/java/com/jens/automation2/Profile.java
index 9c95494..c70b847 100644
--- a/app/src/main/java/com/jens/automation2/Profile.java
+++ b/app/src/main/java/com/jens/automation2/Profile.java
@@ -62,7 +62,7 @@ public class Profile implements Comparable<Profile>
 	public void setName(String name)
 	{
 		this.oldName = this.name;
-		this.name = name;
+		this.name = name.trim();
 	}
 	
 	public String getName()
diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java
index 7385fbb..9f38428 100644
--- a/app/src/main/java/com/jens/automation2/Trigger.java
+++ b/app/src/main/java/com/jens/automation2/Trigger.java
@@ -1430,7 +1430,7 @@ public class Trigger
 
 	public void setTriggerParameter2(String triggerParameter2)
 	{
-		this.triggerParameter2 = triggerParameter2;
+		this.triggerParameter2 = triggerParameter2.trim();
 	}
 
 	public TimeFrame getTimeFrame()
diff --git a/app/src/main/res/layout/activity_manage_action_send_textmessage.xml b/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
index 633ac6d..8a7a063 100644
--- a/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
+++ b/app/src/main/res/layout/activity_manage_action_send_textmessage.xml
@@ -42,11 +42,13 @@
         </EditText>
 
         <TextView
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/messageType" />
 
         <RadioGroup
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" >