diff --git a/src/Notes-master/res/layout/dialog_create_new_folder.xml b/src/Notes-master/res/layout/dialog_create_new_folder.xml
new file mode 100644
index 0000000..21bbbc1
--- /dev/null
+++ b/src/Notes-master/res/layout/dialog_create_new_folder.xml
@@ -0,0 +1,29 @@
+<?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"
+    android:gravity="center_vertical">
+
+    <LinearLayout
+
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center">
+        <TextView
+            android:id="@+id/folder_name_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="输入文件夹名："/>
+
+        <EditText
+            android:id="@+id/folder_name"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:password="true"/>
+    </LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/Notes-master/res/layout/dialog_edit_text.xml b/src/Notes-master/res/layout/dialog_edit_text.xml
index bc9178f..677719b 100644
--- a/src/Notes-master/res/layout/dialog_edit_text.xml
+++ b/src/Notes-master/res/layout/dialog_edit_text.xml
@@ -26,13 +26,13 @@
         android:layout_height="wrap_content"
         android:gravity="center">
         <TextView
-            android:id="@+id/et_foler_name_old_view"
+            android:id="@+id/old_password_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="输入原密码："/>
 
         <EditText
-            android:id="@+id/et_foler_name_old"
+            android:id="@+id/old_password"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:password="true"/>
@@ -43,13 +43,13 @@
         android:layout_height="wrap_content"
         android:gravity="center">
         <TextView
-            android:id="@+id/et_foler_name_view"
+            android:id="@+id/new_password_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="输入新建密码："/>
 
         <EditText
-            android:id="@+id/et_foler_name"
+            android:id="@+id/new_password"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:password="true"/>
@@ -61,13 +61,13 @@
         android:layout_height="wrap_content"
         android:gravity="center">
         <TextView
-            android:id="@+id/et_foler_name_again_view"
+            android:id="@+id/new_password_again_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="确认密码："/>
 
         <EditText
-            android:id="@+id/et_foler_name_again"
+            android:id="@+id/new_password_again"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:password="true"/>
diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
index c18427a..d0877a7 100644
--- a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
@@ -281,14 +281,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             final AlertDialog.Builder builder = new AlertDialog.Builder(this);
             View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
             //编辑dialog界面
-            final EditText etNameOld= (EditText)view.findViewById(R.id.et_foler_name_old);//只需要验证原密码
-            final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
+            final EditText etNameOld= (EditText)view.findViewById(R.id.old_password);//只需要验证原密码
+            final EditText etName = (EditText) view.findViewById(R.id.new_password);
             etName.setVisibility(view.GONE);
-            final TextView etName_View=(TextView)view.findViewById(R.id.et_foler_name_view);
+            final TextView etName_View=(TextView)view.findViewById(R.id.new_password_view);
             etName_View.setVisibility(view.GONE);
-            final EditText etNameAgain = (EditText) view.findViewById(R.id.et_foler_name_again);
+            final EditText etNameAgain = (EditText) view.findViewById(R.id.new_password_again);
             etNameAgain.setVisibility(view.GONE);
-            final TextView etNameAgain_View=(TextView)view.findViewById(R.id.et_foler_name_again_view);
+            final TextView etNameAgain_View=(TextView)view.findViewById(R.id.new_password_again_view);
             etNameAgain_View.setVisibility(view.GONE);
             //
             builder.setTitle("密码检验");
@@ -644,9 +644,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         final View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text,null);
         //编辑Text
-        final EditText etNameOld= (EditText)view.findViewById(R.id.et_foler_name_old);//如果设置了密码，这是原密码
+        final EditText etNameOld= (EditText)view.findViewById(R.id.old_password);//如果设置了密码，这是原密码
         etNameOld.setVisibility(view.GONE);
-        final TextView etNameOld_View=(TextView)view.findViewById(R.id.et_foler_name_old_view);
+        final TextView etNameOld_View=(TextView)view.findViewById(R.id.old_password_view);
         etNameOld_View.setVisibility(view.GONE);
         if (mWorkingNote.hasPassword()){//如果设置了密码
             etNameOld.setVisibility(view.VISIBLE);
@@ -654,8 +654,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             etNameOld.setText("");
             etNameOld.setHint("请输入原密码");
         }
-        final EditText etName = (EditText)view.findViewById(R.id.et_foler_name);//要设置的密码
-        final EditText etNameAgain=(EditText)view.findViewById(R.id.et_foler_name_again);//确认密码
+        final EditText etName = (EditText)view.findViewById(R.id.new_password);//要设置的密码
+        final EditText etNameAgain=(EditText)view.findViewById(R.id.new_password_again);//确认密码
         //final EditText finalEtNameOld = etNameOld;
         etName.setText("");
         etName.setHint("请输入密码");
diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
index 6a53db8..51b74eb 100644
--- a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
@@ -581,8 +581,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private void showCreateOrModifyFolderDialog(final boolean create) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
-        final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
+        View view = LayoutInflater.from(this).inflate(R.layout.dialog_create_new_folder, null);
+        final EditText etName = (EditText) view.findViewById(R.id.folder_name);
         showSoftInput();
         if (!create) {
             if (mFocusNoteDataItem != null) {
@@ -783,6 +783,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         switch (item.getItemId()) {
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
+                Log.d("创建了文件夹","是的");
                 break;
             }
             case R.id.menu_export_text: {