diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index a621b8e..d5014ed 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java
index 68fcee8..1d2332b 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderNoteFragment.java
@@ -15,6 +15,7 @@ import butterknife.OnClick;
 import ch.pizzaleu.android.R;
 import ch.pizzaleu.android.activity.BaseActivity;
 import ch.pizzaleu.android.activity.CreateOrderActivity;
+import ch.pizzaleu.android.api.ApiConstants;
 import ch.pizzaleu.android.helper.SharedPrefsHelper;
 import ch.pizzaleu.android.model.cart.CartProductModel;
 import ch.pizzaleu.android.view.AppEditText;
@@ -102,6 +103,12 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
             }
         }
          */
+        int hintResId = R.string.order_note_title_for_free_shipping;
+        if(createOrderActivity.getSelectedShippingMethod().getCode().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
+            hintResId = R.string.order_note_title_for_self_pickup;
+        }
+        orderNoteAppEditText.setHint(hintResId);
+
         if(createOrderActivity.getOrderNote() != null){
             orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
         }
diff --git a/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java b/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java
index 6430d9e..ade875b 100644
--- a/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java
+++ b/app/src/main/java/ch/pizzaleu/android/view/AppEditText.java
@@ -156,6 +156,10 @@ public class AppEditText extends LinearLayout implements View.OnClickListener {
         inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
     }
 
+    public void setHint(int hintResId){
+        hintTextView.setText(hintResId);
+    }
+
     private void goNextLineWhenEndOfLine(){
         editText.addTextChangedListener(new TextWatcher() {
             @Override
diff --git a/app/src/main/res/layout/fragment_create_order_note.xml b/app/src/main/res/layout/fragment_create_order_note.xml
index 3066a6d..f9ad8b1 100644
--- a/app/src/main/res/layout/fragment_create_order_note.xml
+++ b/app/src/main/res/layout/fragment_create_order_note.xml
@@ -16,7 +16,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:edittextTheme="navy"
-        app:hint="@string/order_note"
         app:characterCount="160"
         app:inputType="multiline"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31ef32b..87d4d46 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,7 +171,8 @@
     <!-- PaymentMethodFragment-->
 
     <!-- CreateOrderNoteFragment-->
-    <string name="order_note">Was sollen wir beachten? (geben Sie Ihr Stockwerk ein)</string>
+    <string name="order_note_title_for_free_shipping">Was sollen wir beachten? (geben Sie Ihr Stockwerk ein)</string>
+    <string name="order_note_title_for_self_pickup">Was sollen wir beachten?</string>
     <string name="slice_pizza_for_customer">Aus Gründen der Qualität empfehlen wir nicht, die Pizza zu schneiden</string>
     <string name="slice_pizza">Bitte Pizza Schneiden</string>
     <string name="do_not_slice_pizza">Nein, bitte Pizza nicht schneiden</string>